材料等级增加来源

王富生
1 parent a5805f70
Showing 6 changed files with 22 additions and 0 deletions
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailPageReqVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailRespVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailSaveReqVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/materialdetail/MaterialDetailDO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/materialdetail/MaterialDetailMapper.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.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;
@@ -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;
@@ -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;
@@ -31,6 +31,11 @@ public class MaterialDetailDO extends BaseDO {
      * 工单号
      */
     private String orderNo;
+
+    /**
+     * 来源 1:工单;2:园林-巡查；3:园林-养护
+     */
+    private Integer source;
     /**
      * 提交用户ID
      */
@@ -20,6 +20,7 @@ public interface MaterialDetailMapper extends BaseMapperX&lt;MaterialDetailDO&gt; {
     default PageResult<MaterialDetailDO> selectPage(MaterialDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<MaterialDetailDO>()
                 .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())
@@ -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;