From 6f8d851554193a009c5c5bee237a632c5b56ef13 Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Sat, 20 Dec 2025 19:57:07 +0800 Subject: [PATCH] 材料等级增加来源 --- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailPageReqVO.java | 3 +++ urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailRespVO.java | 4 ++++ urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailSaveReqVO.java | 6 ++++++ urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/materialdetail/MaterialDetailDO.java | 5 +++++ urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/materialdetail/MaterialDetailMapper.java | 1 + urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java | 3 +++ 6 files changed, 22 insertions(+), 0 deletions(-) diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailPageReqVO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailPageReqVO.java index faaa226..0f8d714 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailPageReqVO.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailPageReqVO.java @@ -16,6 +16,9 @@ public class MaterialDetailPageReqVO extends PageParam { @Schema(description = "工单号") private String orderNo; + @Schema(description = "来源 1:工单;2:园林-巡查；3:园林-养护", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Integer source; + @Schema(description = "提交用户ID", example = "10300") private Long userId; diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailRespVO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailRespVO.java index 0bd68aa..d5fe749 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailRespVO.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailRespVO.java @@ -20,6 +20,10 @@ public class MaterialDetailRespVO { @ExcelProperty("工单号") private String orderNo; + @Schema(description = "来源 1:工单;2:园林-巡查；3:园林-养护", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("来源 1:工单;2:园林-巡查；3:园林-养护") + private Integer source; + @Schema(description = "提交用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10300") @ExcelProperty("提交用户ID") private Long userId; diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailSaveReqVO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailSaveReqVO.java index 31aa61c..88f859d 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailSaveReqVO.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailSaveReqVO.java @@ -16,6 +16,12 @@ public class MaterialDetailSaveReqVO { @NotEmpty(message = "工单号不能为空") private String orderNo; + /** + * 来源 1:工单;2:园林-巡查；3:园林-养护 + */ + @Schema(description = "来源 1:工单;2:园林-巡查；3:园林-养护", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Integer source; + @Schema(description = "种类ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27821") @NotNull(message = "种类ID不能为空") private Long classifyId; diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/materialdetail/MaterialDetailDO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/materialdetail/MaterialDetailDO.java index 9b12141..0bc75df 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/materialdetail/MaterialDetailDO.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/materialdetail/MaterialDetailDO.java @@ -31,6 +31,11 @@ public class MaterialDetailDO extends BaseDO { * 工单号 */ private String orderNo; + + /** + * 来源 1:工单;2:园林-巡查；3:园林-养护 + */ + private Integer source; /** * 提交用户ID */ diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/materialdetail/MaterialDetailMapper.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/materialdetail/MaterialDetailMapper.java index a85fbbb..dd992fd 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/materialdetail/MaterialDetailMapper.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/materialdetail/MaterialDetailMapper.java @@ -20,6 +20,7 @@ public interface MaterialDetailMapper extends BaseMapperX { default PageResult selectPage(MaterialDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(MaterialDetailDO::getOrderNo, reqVO.getOrderNo()) + .eqIfPresent(MaterialDetailDO::getSource, reqVO.getSource()) .eqIfPresent(MaterialDetailDO::getUserId, reqVO.getUserId()) .likeIfPresent(MaterialDetailDO::getUserName, reqVO.getUserName()) .eqIfPresent(MaterialDetailDO::getClassifyId, reqVO.getClassifyId()) diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java index 39b6495..800ecb7 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java @@ -104,6 +104,9 @@ public class MaterialDetailServiceImpl implements MaterialDetailService { .map(vo -> { MaterialDetailDO detailDO = new MaterialDetailDO(); BeanUtils.copyProperties(vo, detailDO); // 单个对象属性拷贝 + if(detailDO.getSource() == null){ + detailDO.setSource(1); + } detailDO.setUserId(getLoginUserId()); detailDO.setUserName(getLoginUserNickname()); return detailDO; -- libgit2 0.21.4