BJ_FS / urbanops

Commit 6f8d851554193a009c5c5bee237a632c5b56ef13

Authored by 王富生
1 parent a5805f70

材料等级增加来源

Inline Side-by-side
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
  View file @6f8d851
... ... @@ -16,6 +16,9 @@ public class MaterialDetailPageReqVO extends PageParam {
16 16 @Schema(description = "工单号")
17 17 private String orderNo;
18 18  
  19 + @Schema(description = "来源 1:工单;2:园林-巡查；3:园林-养护", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  20 + private Integer source;
  21 +
19 22 @Schema(description = "提交用户ID", example = "10300")
20 23 private Long userId;
21 24  
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailRespVO.java
  View file @6f8d851
... ... @@ -20,6 +20,10 @@ public class MaterialDetailRespVO {
20 20 @ExcelProperty("工单号")
21 21 private String orderNo;
22 22  
  23 + @Schema(description = "来源 1:工单;2:园林-巡查；3:园林-养护", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  24 + @ExcelProperty("来源 1:工单;2:园林-巡查；3:园林-养护")
  25 + private Integer source;
  26 +
23 27 @Schema(description = "提交用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10300")
24 28 @ExcelProperty("提交用户ID")
25 29 private Long userId;
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailSaveReqVO.java
  View file @6f8d851
... ... @@ -16,6 +16,12 @@ public class MaterialDetailSaveReqVO {
16 16 @NotEmpty(message = "工单号不能为空")
17 17 private String orderNo;
18 18  
  19 + /**
  20 + * 来源 1:工单;2:园林-巡查；3:园林-养护
  21 + */
  22 + @Schema(description = "来源 1:工单;2:园林-巡查；3:园林-养护", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  23 + private Integer source;
  24 +
19 25 @Schema(description = "种类ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27821")
20 26 @NotNull(message = "种类ID不能为空")
21 27 private Long classifyId;
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/materialdetail/MaterialDetailDO.java
  View file @6f8d851
... ... @@ -31,6 +31,11 @@ public class MaterialDetailDO extends BaseDO {
31 31 * 工单号
32 32 */
33 33 private String orderNo;
  34 +
  35 + /**
  36 + * 来源 1:工单;2:园林-巡查；3:园林-养护
  37 + */
  38 + private Integer source;
34 39 /**
35 40 * 提交用户ID
36 41 */
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/materialdetail/MaterialDetailMapper.java
  View file @6f8d851
... ... @@ -20,6 +20,7 @@ public interface MaterialDetailMapper extends BaseMapperX<MaterialDetailDO> {
20 20 default PageResult<MaterialDetailDO> selectPage(MaterialDetailPageReqVO reqVO) {
21 21 return selectPage(reqVO, new LambdaQueryWrapperX<MaterialDetailDO>()
22 22 .eqIfPresent(MaterialDetailDO::getOrderNo, reqVO.getOrderNo())
  23 + .eqIfPresent(MaterialDetailDO::getSource, reqVO.getSource())
23 24 .eqIfPresent(MaterialDetailDO::getUserId, reqVO.getUserId())
24 25 .likeIfPresent(MaterialDetailDO::getUserName, reqVO.getUserName())
25 26 .eqIfPresent(MaterialDetailDO::getClassifyId, reqVO.getClassifyId())
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java
  View file @6f8d851
... ... @@ -104,6 +104,9 @@ public class MaterialDetailServiceImpl implements MaterialDetailService {
104 104 .map(vo -> {
105 105 MaterialDetailDO detailDO = new MaterialDetailDO();
106 106 BeanUtils.copyProperties(vo, detailDO); // 单个对象属性拷贝
  107 + if(detailDO.getSource() == null){
  108 + detailDO.setSource(1);
  109 + }
107 110 detailDO.setUserId(getLoginUserId());
108 111 detailDO.setUserName(getLoginUserNickname());
109 112 return detailDO;
... ...