From 7b6cc825c00bd6db2d060ee0d978d340b5fc750d Mon Sep 17 00:00:00 2001 From: HuangHuiKang Date: Tue, 2 Jun 2026 15:25:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=85=B7?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moldrepair/vo/MoldRepairPageReqVO.java | 2 + .../admin/moldrepair/vo/MoldRepairRespVO.java | 46 ++++++++++++++- .../moldrepair/vo/MoldRepairSaveReqVO.java | 40 ++++++++++++- .../dataobject/moldrepair/MoldRepairDO.java | 57 ++++++++++++++++++- .../mysql/moldrepair/MoldRepairMapper.java | 3 +- .../moldrepair/MoldRepairServiceImpl.java | 2 +- 6 files changed, 144 insertions(+), 6 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 ab4c92889..02bac7482 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 @@ -72,6 +72,8 @@ public class MoldRepairPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + @Schema(description = "维修结果") + private Integer repairStatus; @Schema(description = "ids集合导出用") private String ids; 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 799893ec0..335202010 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 @@ -113,5 +113,49 @@ public class MoldRepairRespVO { @ExcelProperty("维修状态") private String repairStatusName; + @Schema(description = "故障等级 1-一般 2-严重 3-紧急") + @ExcelProperty("故障等级") + private Integer faultLevel; -} \ No newline at end of file + @Schema(description = "是否停机") + @ExcelProperty("是否停机") + private Boolean shutdown; + + @Schema(description = "故障现象") + @ExcelProperty("故障现象") + private String faultPhenomenon; + + @Schema(description = "故障描述") + @ExcelProperty("故障描述") + private String faultDescription; + + @Schema(description = "故障图片，多个逗号分隔") + @ExcelProperty("故障图片") + private String faultImages; + + @Schema(description = "停机时长") + @ExcelProperty("停机时长") + private String shutdownDuration; + + @Schema(description = "故障原因") + @ExcelProperty("故障原因") + private String faultReason; + + @Schema(description = "处理措施") + @ExcelProperty("处理措施") + private String treatmentMeasures; + + @Schema(description = "更换配件") + @ExcelProperty("更换配件") + private String replacementParts; + + @Schema(description = "维修总结/维修内容") + @ExcelProperty("维修总结/维修内容") + private String repairSummary; + + @Schema(description = "维修后图片，多个逗号分隔") + @ExcelProperty("维修后图片") + private String repairedImages; + + +} 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 74acb0c7c..716ae88c4 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 @@ -52,9 +52,12 @@ public class MoldRepairSaveReqVO { @Schema(description = "验收日期") private LocalDateTime confirmDate; +// +// @Schema(description = "维修结果") +// private String repairResult; @Schema(description = "维修结果") - private String repairResult; + private String repairStatus; @Schema(description = "维修人员") private String acceptedBy; @@ -80,4 +83,37 @@ public class MoldRepairSaveReqVO { @Schema(description = "关键件Id") private Long componentId; -} \ No newline at end of file + @Schema(description = "故障等级 1-一般 2-严重 3-紧急") + private Integer faultLevel; + + @Schema(description = "是否停机") + private Boolean shutdown; + + @Schema(description = "故障现象") + private String faultPhenomenon; + + @Schema(description = "故障描述") + private String faultDescription; + + @Schema(description = "故障图片，多个逗号分隔") + private String faultImages; + + @Schema(description = "停机时长") + private String shutdownDuration; + + @Schema(description = "故障原因") + private String faultReason; + + @Schema(description = "处理措施") + private String treatmentMeasures; + + @Schema(description = "更换配件") + private String replacementParts; + + @Schema(description = "维修总结/维修内容") + private String repairSummary; + + @Schema(description = "维修后图片，多个逗号分隔") + private String repairedImages; + +} 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 2e54dc63f..296444b32 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 @@ -117,4 +117,59 @@ public class MoldRepairDO extends BaseDO { */ private Integer repairStatus; -} \ No newline at end of file + /** + * 故障等级 1-一般 2-严重 3-紧急 + */ + private Integer faultLevel; + + /** + * 是否停机 + */ + private Boolean shutdown; + + /** + * 故障现象 + */ + private String faultPhenomenon; + + /** + * 故障描述 + */ + private String faultDescription; + + /** + * 故障图片，多个逗号分隔 + */ + private String faultImages; + + /** + * 停机时长 + */ + private String shutdownDuration; + + /** + * 故障原因 + */ + private String faultReason; + + /** + * 处理措施 + */ + private String treatmentMeasures; + + /** + * 更换配件 + */ + private String replacementParts; + + /** + * 维修总结/维修内容 + */ + private String repairSummary; + + /** + * 维修后图片，多个逗号分隔 + */ + private String repairedImages; + +} 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 6388e48fa..400620ba9 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 @@ -27,7 +27,7 @@ public interface MoldRepairMapper extends BaseMapperX { LambdaQueryWrapperX moldRepairDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>(); moldRepairDOLambdaQueryWrapperX - .eqIfPresent(MoldRepairDO::getRepairCode, reqVO.getRepairCode()) + .likeIfPresent(MoldRepairDO::getRepairCode, reqVO.getRepairCode()) .likeIfPresent(MoldRepairDO::getRepairName, reqVO.getRepairName()) .eqIfPresent(MoldRepairDO::getMoldId, reqVO.getMoldId()) .eqIfPresent(MoldRepairDO::getMoldCode, reqVO.getMoldCode()) @@ -38,6 +38,7 @@ public interface MoldRepairMapper extends BaseMapperX { .betweenIfPresent(MoldRepairDO::getRequireDate, reqVO.getRequireDate()) .betweenIfPresent(MoldRepairDO::getFinishDate, reqVO.getFinishDate()) .betweenIfPresent(MoldRepairDO::getConfirmDate, reqVO.getConfirmDate()) + .eqIfPresent(MoldRepairDO::getRepairStatus, reqVO.getRepairStatus()) .eqIfPresent(MoldRepairDO::getRepairResult, reqVO.getRepairResult()) .eqIfPresent(MoldRepairDO::getAcceptedBy, reqVO.getAcceptedBy()) .eqIfPresent(MoldRepairDO::getConfirmBy, reqVO.getConfirmBy()) diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairServiceImpl.java index 64519e627..7d948fcb3 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairServiceImpl.java @@ -109,7 +109,7 @@ public class MoldRepairServiceImpl implements MoldRepairService { moldRepairMapper.updateById(updateObj); // 更新子表 - updateMoldRepairLineList(updateReqVO.getId(), updateReqVO.getMoldRepairLines()); +// updateMoldRepairLineList(updateReqVO.getId(), updateReqVO.getMoldRepairLines()); } @Override