From a4e55b23ce1bf77169272b8a433f4302a314344f Mon Sep 17 00:00:00 2001 From: HuangHuiKang Date: Thu, 9 Jul 2026 09:45:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6=E5=8D=B3=E6=A8=A1=E5=85=B7?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=8D=95=E6=8A=A5=E4=BF=AE=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moldrepair/vo/MoldRepairPageReqVO.java | 5 ++++- .../admin/moldrepair/vo/MoldRepairRespVO.java | 4 ++++ .../moldrepair/vo/MoldRepairSaveReqVO.java | 3 +++ .../dataobject/moldrepair/MoldRepairDO.java | 4 ++++ .../dal/mysql/moldrepair/MoldRepairMapper.java | 3 ++- .../admin/dvrepair/DvRepairController.java | 18 ++++++++++++++++++ .../admin/dvrepair/vo/DvRepairPageReqVO.java | 3 +++ .../admin/dvrepair/vo/DvRepairRespVO.java | 4 ++++ .../admin/dvrepair/vo/DvRepairSaveReqVO.java | 3 +++ .../admin/moldrepair/MoldRepairController.java | 18 ++++++++++++++++++ .../dal/dataobject/dvrepair/DvRepairDO.java | 4 ++++ .../mes/dal/mysql/dvrepair/DvRepairMapper.java | 1 + 12 files changed, 68 insertions(+), 2 deletions(-) diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairPageReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairPageReqVO.java index 02bac7482..fd6ea9bbf 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairPageReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairPageReqVO.java @@ -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; -} \ No newline at end of file +} diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairRespVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairRespVO.java index 335202010..335a8aca9 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairRespVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairRespVO.java @@ -74,6 +74,10 @@ public class MoldRepairRespVO { @ExcelProperty("维修人员") private String acceptedBy; + @Schema(description = "报修人员") + @ExcelProperty("报修人员") + private String repairReporter; + @Schema(description = "验收人员") @ExcelProperty("验收人员") private String confirmBy; diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairSaveReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairSaveReqVO.java index 716ae88c4..e2ce39ba8 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairSaveReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairSaveReqVO.java @@ -62,6 +62,9 @@ public class MoldRepairSaveReqVO { @Schema(description = "维修人员") private String acceptedBy; + @Schema(description = "报修人员") + private String repairReporter; + @Schema(description = "验收人员") private String confirmBy; diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldrepair/MoldRepairDO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldrepair/MoldRepairDO.java index 296444b32..4e42b6947 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldrepair/MoldRepairDO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldrepair/MoldRepairDO.java @@ -82,6 +82,10 @@ public class MoldRepairDO extends BaseDO { * 维修人员 */ private String acceptedBy; + /** + * 报修人员 + */ + private String repairReporter; /** * 验收人员 */ diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldrepair/MoldRepairMapper.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldrepair/MoldRepairMapper.java index 400620ba9..c105d56d0 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldrepair/MoldRepairMapper.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldrepair/MoldRepairMapper.java @@ -41,6 +41,7 @@ public interface MoldRepairMapper extends BaseMapperX { .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 { return selectPage(reqVO,moldRepairDOLambdaQueryWrapperX ); } -} \ No newline at end of file +} diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java index 8a94379b7..40b1f22de 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java @@ -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) { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairPageReqVO.java index f50147393..c0dc24899 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairPageReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairPageReqVO.java @@ -63,6 +63,9 @@ public class DvRepairPageReqVO extends PageParam { @Schema(description = "维修人员") private String acceptedBy; + @Schema(description = "报修人员") + private String repairReporter; + @Schema(description = "验收人员") private String confirmBy; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairRespVO.java index 60e55954f..b7e4372ee 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairRespVO.java @@ -128,6 +128,10 @@ public class DvRepairRespVO { @ExcelProperty("维修人员") private String acceptedBy; + @Schema(description = "报修人员") + @ExcelProperty("报修人员") + private String repairReporter; + @Schema(description = "验收人员") @ExcelProperty("验收人员") private String confirmBy; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairSaveReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairSaveReqVO.java index c937d4530..aaf9f3677 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairSaveReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairSaveReqVO.java @@ -93,6 +93,9 @@ public class DvRepairSaveReqVO { @Schema(description = "维修人员") private String acceptedBy; + @Schema(description = "报修人员") + private String repairReporter; + @Schema(description = "验收人员") private String confirmBy; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/MoldRepairController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/MoldRepairController.java index 0773deae5..805bed8da 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/MoldRepairController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/MoldRepairController.java @@ -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) { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dvrepair/DvRepairDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dvrepair/DvRepairDO.java index b5456bfb5..3bd99b96f 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dvrepair/DvRepairDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dvrepair/DvRepairDO.java @@ -139,6 +139,10 @@ public class DvRepairDO extends BaseDO { * 维修人员 */ private String acceptedBy; + /** + * 报修人员 + */ + private String repairReporter; /** * 验收人员 */ diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dvrepair/DvRepairMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dvrepair/DvRepairMapper.java index af7eec9d7..1102b337f 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dvrepair/DvRepairMapper.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dvrepair/DvRepairMapper.java @@ -51,6 +51,7 @@ public interface DvRepairMapper extends BaseMapperX { .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())