BJ_FS / urbanops

Commit e3a3a1393886eb39708bee657941869710a96143

Authored by 颜惠青
1 parent 49a5dab0

工单接口字段统一

Inline Side-by-side
Showing 9 changed files with 50 additions and 11 deletions
urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderReqVO.java
  View file @e3a3a13
... ... @@ -34,7 +34,10 @@ public class AppGardenWorkOrderReqVO {
34 34 private String roadName;
35 35  
36 36 @Schema(description = "问题图片", example = "9184")
37   - private List<String> imgs;
  37 + private List<String> problemsImgs;
  38 +
  39 + @Schema(description = "实施结束的拍照图片")
  40 + private List<String> endImgs;
38 41  
39 42 @Schema(description = "工单描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对")
40 43 @NotEmpty(message = "工单描述不能为空")
... ... @@ -79,6 +82,9 @@ public class AppGardenWorkOrderReqVO {
79 82 @Schema(description = "三方工单ID")
80 83 private String thirdWorkNo;
81 84  
  85 + @Schema(description = "希望完成时间")
  86 + private LocalDateTime expectedFinishDate;
  87 +
82 88 @Schema(description = "完成时间")
83 89 private LocalDateTime finishDate;
84 90  
... ...
urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/MainInfoRespVO.java
  View file @e3a3a13
... ... @@ -67,6 +67,10 @@ public class MainInfoRespVO {
67 67 @ExcelProperty("提交日期")
68 68 private LocalDateTime commitDate;
69 69  
  70 + @Schema(description = "希望完成时间", requiredMode = Schema.RequiredMode.REQUIRED)
  71 + @ExcelProperty("希望完成时间")
  72 + private LocalDateTime expectedFinishDate;
  73 +
70 74 @Schema(description = "完成时间", requiredMode = Schema.RequiredMode.REQUIRED)
71 75 @ExcelProperty("完成时间")
72 76 private LocalDateTime finishDate;
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java
  View file @e3a3a13
... ... @@ -19,7 +19,7 @@ public interface AppGardenWorkOrderConvert {
19 19 AppGardenWorkOrderReqVO orderReqVO = new AppGardenWorkOrderReqVO();
20 20 orderReqVO.setRoadId(inspectionPlanDO.getRoadId());
21 21 orderReqVO.setRoadName(inspectionPlanDO.getRoadName());
22   - orderReqVO.setImgs(createReqVO.getImgList());
  22 + orderReqVO.setProblemsImgs(createReqVO.getImgList());
23 23 orderReqVO.setRemark(createReqVO.getRemark());
24 24 orderReqVO.setPressingType(2);//紧急
25 25 orderReqVO.setOrderName(inspectionPlanDO.getPlanName());
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoPageReqVO.java
  View file @e3a3a13
... ... @@ -53,6 +53,10 @@ public class MainInfoPageReqVO extends PageParam {
53 53 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
54 54 private LocalDateTime[] commitDate;
55 55  
  56 + @Schema(description = "希望完成时间")
  57 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  58 + private LocalDateTime[] expectedFinishDate;
  59 +
56 60 @Schema(description = "完成时间")
57 61 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
58 62 private LocalDateTime[] finishDate;
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoDO.java
  View file @e3a3a13
... ... @@ -91,6 +91,11 @@ public class MainInfoDO extends BaseDO {
91 91 private LocalDateTime commitDate;
92 92  
93 93 /**
  94 + * 希望完成时间
  95 + */
  96 + private LocalDateTime expectedFinishDate;
  97 +
  98 + /**
94 99 * 完成时间
95 100 */
96 101 private LocalDateTime finishDate;
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoExtDO.java
  View file @e3a3a13
... ... @@ -83,7 +83,10 @@ public class MainInfoExtDO extends BaseDO {
83 83 * 提交日期
84 84 */
85 85 private LocalDateTime commitDate;
86   -
  86 + /**
  87 + * 希望完成时间
  88 + */
  89 + private LocalDateTime expectedFinishDate;
87 90 /**
88 91 * 完成时间
89 92 */
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java
  View file @e3a3a13
... ... @@ -114,6 +114,7 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
114 114 @Result(column = "curing_level_id", property = "curingLevelId"),
115 115 @Result(column = "curing_level_name", property = "curingLevelName"),
116 116 @Result(column = "commit_date", property = "commitDate"),
  117 + @Result(column = "expected_finish_date", property = "expectedFinishDate"),
117 118 @Result(column = "finish_date", property = "finishDate"),
118 119 @Result(column = "pressing_type", property = "pressingType"),
119 120 @Result(column = "user_id", property = "userId"),
... ... @@ -227,6 +228,7 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
227 228 @Result(column = "curing_level_id", property = "curingLevelId"),
228 229 @Result(column = "curing_level_name", property = "curingLevelName"),
229 230 @Result(column = "commit_date", property = "commitDate"),
  231 + @Result(column = "expected_finish_date", property = "expectedFinishDate"),
230 232 @Result(column = "finish_date", property = "finishDate"),
231 233 @Result(column = "pressing_type", property = "pressingType"),
232 234 @Result(column = "user_id", property = "userId"),
... ... @@ -334,6 +336,7 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
334 336 @Result(column = "curing_level_id", property = "curingLevelId"),
335 337 @Result(column = "curing_level_name", property = "curingLevelName"),
336 338 @Result(column = "commit_date", property = "commitDate"),
  339 + @Result(column = "expected_finish_date", property = "expectedFinishDate"),
337 340 @Result(column = "finish_date", property = "finishDate"),
338 341 @Result(column = "pressing_type", property = "pressingType"),
339 342 @Result(column = "user_id", property = "userId"),
... ... @@ -452,6 +455,7 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
452 455 @Result(column = "curing_level_id", property = "curingLevelId"),
453 456 @Result(column = "curing_level_name", property = "curingLevelName"),
454 457 @Result(column = "commit_date", property = "commitDate"),
  458 + @Result(column = "expected_finish_date", property = "expectedFinishDate"),
455 459 @Result(column = "finish_date", property = "finishDate"),
456 460 @Result(column = "pressing_type", property = "pressingType"),
457 461 @Result(column = "user_id", property = "userId"),
... ... @@ -560,6 +564,7 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
560 564 @Result(column = "curing_level_id", property = "curingLevelId"),
561 565 @Result(column = "curing_level_name", property = "curingLevelName"),
562 566 @Result(column = "commit_date", property = "commitDate"),
  567 + @Result(column = "expected_finish_date", property = "expectedFinishDate"),
563 568 @Result(column = "finish_date", property = "finishDate"),
564 569 @Result(column = "pressing_type", property = "pressingType"),
565 570 @Result(column = "user_id", property = "userId"),
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java
  View file @e3a3a13
... ... @@ -56,6 +56,8 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; {
56 56 .likeIfPresent(MainInfoDO::getStreetName, reqVO.getStreetName())
57 57 .eqIfPresent(MainInfoDO::getCuringLevelId, reqVO.getCuringLevelId())
58 58 .likeIfPresent(MainInfoDO::getCuringLevelName, reqVO.getCuringLevelName())
  59 +
  60 + .betweenIfPresent(MainInfoDO::getExpectedFinishDate, reqVO.getExpectedFinishDate())
59 61 .betweenIfPresent(MainInfoDO::getCommitDate, reqVO.getCommitDate())
60 62 .betweenIfPresent(MainInfoDO::getFinishDate, reqVO.getFinishDate())
61 63 .eqIfPresent(MainInfoDO::getPressingType, reqVO.getPressingType())
... ... @@ -99,6 +101,7 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; {
99 101 .likeIfPresent(MainInfoDO::getStreetName, reqVO.getStreetName())
100 102 .eqIfPresent(MainInfoDO::getCuringLevelId, reqVO.getCuringLevelId())
101 103 .likeIfPresent(MainInfoDO::getCuringLevelName, reqVO.getCuringLevelName())
  104 + .betweenIfPresent(MainInfoDO::getExpectedFinishDate, reqVO.getExpectedFinishDate())
102 105 .betweenIfPresent(MainInfoDO::getCommitDate, reqVO.getCommitDate())
103 106 .betweenIfPresent(MainInfoDO::getFinishDate, reqVO.getFinishDate())
104 107 .eqIfPresent(MainInfoDO::getPressingType, reqVO.getPressingType())
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
  View file @e3a3a13
... ... @@ -129,7 +129,8 @@ public class BpmGardenServiceImpl implements BpmGardenService{
129 129 @Transactional(rollbackFor = Exception.class)
130 130 public Long createWorkOrderQuick(AppGardenWorkOrderReqVO createRequestVo) {
131 131  
132   - List<String> imgList = createRequestVo.getImgs();
  132 + List<String> problemsImgsList = createRequestVo.getProblemsImgs();//问题照片
  133 + List<String> endImgsList = createRequestVo.getEndImgs();//实施完成照片
133 134  
134 135 MainInfoDO workOrder = BeanUtils.toBean(createRequestVo, MainInfoDO.class)
135 136 .setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
... ... @@ -164,14 +165,20 @@ public class BpmGardenServiceImpl implements BpmGardenService{
164 165 workOrder.setUserName(SecurityFrameworkUtils.getLoginUserNickname());
165 166 LocalDateTime now = LocalDateTime.now();
166 167 workOrder.setCommitDate(now);
167   - workOrder.setFinishDate(now);
  168 + if(ObjectUtils.isNotAllEmpty(createRequestVo.getExpectedFinishDate())){
  169 + workOrder.setExpectedFinishDate(createRequestVo.getExpectedFinishDate());
  170 + }
168 171 String workOrderNum = workOrderApi.generateWONum(BpmCommonConstant.WORK_ORDER_PREFFIX_QUICK);
169 172 workOrder.setOrderNo(workOrderNum);
170 173 workOrderMapper.insert(workOrder);
171 174  
172   - if(ObjectUtils.isNotAllEmpty(imgList) && imgList.size()>0){
173   - attachmentInsertOrUpdate(imgList,BpmCommonConstant.PROBLEM_IMG_GROUP,workOrder);
  175 + if(ObjectUtils.isNotAllEmpty(problemsImgsList) && problemsImgsList.size()>0){
  176 + attachmentInsertOrUpdate(problemsImgsList,BpmCommonConstant.PROBLEM_IMG_GROUP,workOrder);
  177 + }
  178 + if(ObjectUtils.isNotAllEmpty(endImgsList) && endImgsList.size()>0){
  179 + attachmentInsertOrUpdate(endImgsList,BpmCommonConstant.END_IMG_GROUP,workOrder);
174 180 }
  181 +
175 182 // 发起 BPM 流程
176 183 Map<String, Object> processInstanceVariables = new HashMap<>();
177 184 processInstanceVariables.put(COMMON_QUICK_PROCESS_INITIATOR, SecurityFrameworkUtils.getLoginUserId());
... ... @@ -544,7 +551,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
544 551 @Override
545 552 @Transactional(rollbackFor = Exception.class)
546 553 public Long createWorkOrder(AppGardenWorkOrderReqVO createRequestVo) {
547   - List<String> imgList = createRequestVo.getImgs();
  554 + List<String> problemsImgsList = createRequestVo.getProblemsImgs();
548 555  
549 556 MainInfoDO workOrder = BeanUtils.toBean(createRequestVo, MainInfoDO.class)
550 557 .setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
... ... @@ -585,12 +592,14 @@ public class BpmGardenServiceImpl implements BpmGardenService{
585 592 }
586 593 workOrder.setUserId(SecurityFrameworkUtils.getLoginUserId());
587 594 workOrder.setUserName(SecurityFrameworkUtils.getLoginUserNickname());
588   - //workOrder.setFinishDate(LocalDateTime.now());
  595 + if(ObjectUtils.isNotAllEmpty(createRequestVo.getExpectedFinishDate())){
  596 + workOrder.setExpectedFinishDate(createRequestVo.getExpectedFinishDate());
  597 + }
589 598 String workOrderNum = workOrderApi.generateWONum(BpmCommonConstant.WORK_ORDER_PREFFIX_GARDEN);
590 599 workOrder.setOrderNo(workOrderNum);
591 600 workOrderMapper.insert(workOrder);
592   - if(ObjectUtils.isNotAllEmpty(imgList) && imgList.size()>0){
593   - attachmentInsertOrUpdate(imgList,BpmCommonConstant.PROBLEM_IMG_GROUP,workOrder);
  601 + if(ObjectUtils.isNotAllEmpty(problemsImgsList) && problemsImgsList.size()>0){
  602 + attachmentInsertOrUpdate(problemsImgsList,BpmCommonConstant.PROBLEM_IMG_GROUP,workOrder);
594 603 }
595 604 // 发起 BPM 流程
596 605 Long userId = SecurityFrameworkUtils.getLoginUserId();
... ...