linweidong
/
besure_server
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:修改添加设备台账即模具维修单报修人员字段

Browse Source
main
HuangHuiKang 2 days ago
parent 69c1e80ed9
commit a4e55b23ce
12 changed files with 68 additions and 2 deletions
Show Stats Download Patch File Download Diff File

5
yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairPageReqVO.java
Unescape Escape View File

@ -59,6 +59,9 @@ public class MoldRepairPageReqVO extends PageParam {
@Schema(description = "维修人员")
private String acceptedBy;
@Schema(description = "报修人员")
private String repairReporter;
@Schema(description = "验收人员")
private String confirmBy;
@ -77,4 +80,4 @@ public class MoldRepairPageReqVO extends PageParam {
@Schema(description = "ids集合导出用")
private String ids;
}
}

4
yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairRespVO.java
Unescape Escape View File

@ -74,6 +74,10 @@ public class MoldRepairRespVO {
@ExcelProperty("维修人员")
private String acceptedBy;
@Schema(description = "报修人员")
@ExcelProperty("报修人员")
private String repairReporter;
@Schema(description = "验收人员")
@ExcelProperty("验收人员")
private String confirmBy;

3
yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairSaveReqVO.java
Unescape Escape View File

@ -62,6 +62,9 @@ public class MoldRepairSaveReqVO {
@Schema(description = "维修人员")
private String acceptedBy;
@Schema(description = "报修人员")
private String repairReporter;
@Schema(description = "验收人员")
private String confirmBy;

4
yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldrepair/MoldRepairDO.java
Unescape Escape View File

@ -82,6 +82,10 @@ public class MoldRepairDO extends BaseDO {
* 维修人员
*/
private String acceptedBy;
/**
* 报修人员
*/
private String repairReporter;
/**
* 验收人员
*/

3
yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldrepair/MoldRepairMapper.java
Unescape Escape View File

@ -41,6 +41,7 @@ public interface MoldRepairMapper extends BaseMapperX<MoldRepairDO> {
.eqIfPresent(MoldRepairDO::getRepairStatus, reqVO.getRepairStatus())
.eqIfPresent(MoldRepairDO::getRepairResult, reqVO.getRepairResult())
.eqIfPresent(MoldRepairDO::getAcceptedBy, reqVO.getAcceptedBy())
.eqIfPresent(MoldRepairDO::getRepairReporter, reqVO.getRepairReporter())
.eqIfPresent(MoldRepairDO::getConfirmBy, reqVO.getConfirmBy())
.eqIfPresent(MoldRepairDO::getStatus, reqVO.getStatus())
.eqIfPresent(MoldRepairDO::getRemark, reqVO.getRemark())
@ -59,4 +60,4 @@ public interface MoldRepairMapper extends BaseMapperX<MoldRepairDO> {
return selectPage(reqVO,moldRepairDOLambdaQueryWrapperX );
}
}
}

18
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java
Unescape Escape View File

@ -121,6 +121,12 @@ public class DvRepairController {
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(dvSubjectRespVO.getAcceptedBy()));
dvSubjectRespVO.setAcceptedBy("(" + user.getUsername() + ")" + user.getNickname());
}
if (dvSubjectRespVO.getRepairReporter() != null) {
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(dvSubjectRespVO.getRepairReporter()));
if (user != null) {
dvSubjectRespVO.setRepairReporter("(" + user.getUsername() + ")" + user.getNickname());
}
}
if (dvSubjectRespVO.getConfirmBy() !=null) {
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(dvSubjectRespVO.getConfirmBy()));
dvSubjectRespVO.setConfirmBy("(" + user.getUsername() + ")" + user.getNickname());
@ -234,6 +240,12 @@ public class DvRepairController {
dvSubjectRespVO.setAcceptedBy("(" + user.getUsername() + ")" + user.getNickname());
}
}
if (dvSubjectRespVO.getRepairReporter() != null) {
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(dvSubjectRespVO.getRepairReporter()));
if (user != null) {
dvSubjectRespVO.setRepairReporter("(" + user.getUsername() + ")" + user.getNickname());
}
}
if (dvSubjectRespVO.getConfirmBy() !=null) {
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(dvSubjectRespVO.getConfirmBy()));
if (user !=null){
@ -253,6 +265,12 @@ public class DvRepairController {
dvRepairRespVO.setAcceptedBy("(" + user.getUsername() + ")" + user.getNickname());
}
}
if (dvRepairRespVO.getRepairReporter() != null) {
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(dvRepairRespVO.getRepairReporter()));
if (user != null) {
dvRepairRespVO.setRepairReporter("(" + user.getUsername() + ")" + user.getNickname());
}
}
if (dvRepairRespVO.getConfirmBy() != null) {
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(dvRepairRespVO.getConfirmBy()));
if (user != null) {

3
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairPageReqVO.java
Unescape Escape View File

@ -63,6 +63,9 @@ public class DvRepairPageReqVO extends PageParam {
@Schema(description = "维修人员")
private String acceptedBy;
@Schema(description = "报修人员")
private String repairReporter;
@Schema(description = "验收人员")
private String confirmBy;

4
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairRespVO.java
Unescape Escape View File

@ -128,6 +128,10 @@ public class DvRepairRespVO {
@ExcelProperty("维修人员")
private String acceptedBy;
@Schema(description = "报修人员")
@ExcelProperty("报修人员")
private String repairReporter;
@Schema(description = "验收人员")
@ExcelProperty("验收人员")
private String confirmBy;

3
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairSaveReqVO.java
Unescape Escape View File

@ -93,6 +93,9 @@ public class DvRepairSaveReqVO {
@Schema(description = "维修人员")
private String acceptedBy;
@Schema(description = "报修人员")
private String repairReporter;
@Schema(description = "验收人员")
private String confirmBy;

18
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/MoldRepairController.java
Unescape Escape View File

@ -120,6 +120,12 @@ public class MoldRepairController {
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(moldSubjectRespVO.getAcceptedBy()));
moldSubjectRespVO.setAcceptedBy("(" + user.getUsername() + ")" + user.getNickname());
}
if (moldSubjectRespVO.getRepairReporter() != null) {
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(moldSubjectRespVO.getRepairReporter()));
if (user != null) {
moldSubjectRespVO.setRepairReporter("(" + user.getUsername() + ")" + user.getNickname());
}
}
if (moldSubjectRespVO.getConfirmBy() !=null) {
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(moldSubjectRespVO.getConfirmBy()));
moldSubjectRespVO.setConfirmBy("(" + user.getUsername() + ")" + user.getNickname());
@ -221,6 +227,12 @@ public class MoldRepairController {
moldSubjectRespVO.setAcceptedBy("(" + user.getUsername() + ")" + user.getNickname());
}
}
if (moldSubjectRespVO.getRepairReporter() != null) {
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(moldSubjectRespVO.getRepairReporter()));
if (user != null) {
moldSubjectRespVO.setRepairReporter("(" + user.getUsername() + ")" + user.getNickname());
}
}
if (moldSubjectRespVO.getConfirmBy() !=null) {
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(moldSubjectRespVO.getConfirmBy()));
if (user!=null) {
@ -240,6 +252,12 @@ public class MoldRepairController {
moldRepairRespVO.setAcceptedBy("(" + user.getUsername() + ")" + user.getNickname());
}
}
if (moldRepairRespVO.getRepairReporter() != null) {
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(moldRepairRespVO.getRepairReporter()));
if (user != null) {
moldRepairRespVO.setRepairReporter("(" + user.getUsername() + ")" + user.getNickname());
}
}
if (moldRepairRespVO.getConfirmBy() != null) {
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(moldRepairRespVO.getConfirmBy()));
if (user != null) {

4
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dvrepair/DvRepairDO.java
Unescape Escape View File

@ -139,6 +139,10 @@ public class DvRepairDO extends BaseDO {
* 维修人员
*/
private String acceptedBy;
/**
* 报修人员
*/
private String repairReporter;
/**
* 验收人员
*/

1
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dvrepair/DvRepairMapper.java
Unescape Escape View File

@ -51,6 +51,7 @@ public interface DvRepairMapper extends BaseMapperX<DvRepairDO> {
.betweenIfPresent(DvRepairDO::getConfirmDate, reqVO.getConfirmDate())
.eqIfPresent(DvRepairDO::getRepairResult, reqVO.getRepairResult())
.eqIfPresent(DvRepairDO::getAcceptedBy, reqVO.getAcceptedBy())
.eqIfPresent(DvRepairDO::getRepairReporter, reqVO.getRepairReporter())
.eqIfPresent(DvRepairDO::getConfirmBy, reqVO.getConfirmBy())
.eqIfPresent(DvRepairDO::getStatus, reqVO.getStatus())
.eqIfPresent(DvRepairDO::getRepairStatus, reqVO.getRepairStatus())

Write Preview
Loading…
Cancel
Save