工单接口字段统一

颜惠青
1 parent 49a5dab0
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
urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/MainInfoRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoPageReqVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoDO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoExtDO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
@@ -34,7 +34,10 @@ public class AppGardenWorkOrderReqVO {
     private String roadName;
     @Schema(description = "问题图片", example = "9184")
-    private List<String> imgs;
+    private List<String> problemsImgs;
+
+    @Schema(description = "实施结束的拍照图片")
+    private List<String> endImgs;
     @Schema(description = "工单描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对")
     @NotEmpty(message = "工单描述不能为空")
@@ -79,6 +82,9 @@ public class AppGardenWorkOrderReqVO {
     @Schema(description = "三方工单ID")
     private String thirdWorkNo;
+    @Schema(description = "希望完成时间")
+    private LocalDateTime expectedFinishDate;
+
     @Schema(description = "完成时间")
     private LocalDateTime finishDate;
@@ -67,6 +67,10 @@ public class MainInfoRespVO {
     @ExcelProperty("提交日期")
     private LocalDateTime commitDate;
+    @Schema(description = "希望完成时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("希望完成时间")
+    private LocalDateTime expectedFinishDate;
+
     @Schema(description = "完成时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("完成时间")
     private LocalDateTime finishDate;
@@ -19,7 +19,7 @@ public interface AppGardenWorkOrderConvert {
         AppGardenWorkOrderReqVO  orderReqVO = new AppGardenWorkOrderReqVO();
         orderReqVO.setRoadId(inspectionPlanDO.getRoadId());
         orderReqVO.setRoadName(inspectionPlanDO.getRoadName());
-        orderReqVO.setImgs(createReqVO.getImgList());
+        orderReqVO.setProblemsImgs(createReqVO.getImgList());
         orderReqVO.setRemark(createReqVO.getRemark());
         orderReqVO.setPressingType(2);//紧急
         orderReqVO.setOrderName(inspectionPlanDO.getPlanName());
@@ -53,6 +53,10 @@ public class MainInfoPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] commitDate;
+    @Schema(description = "希望完成时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] expectedFinishDate;
+
     @Schema(description = "完成时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] finishDate;
@@ -91,6 +91,11 @@ public class MainInfoDO extends BaseDO {
     private LocalDateTime commitDate;
     /**
+     * 希望完成时间
+     */
+    private LocalDateTime expectedFinishDate;
+
+    /**
      * 完成时间
      */
     private LocalDateTime finishDate;
@@ -83,7 +83,10 @@ public class MainInfoExtDO extends BaseDO {
      * 提交日期
      */
     private LocalDateTime commitDate;
-
+    /**
+     * 希望完成时间
+     */
+    private LocalDateTime expectedFinishDate;
     /**
      * 完成时间
      */
@@ -114,6 +114,7 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
             @Result(column = "curing_level_id", property = "curingLevelId"),
             @Result(column = "curing_level_name", property = "curingLevelName"),
             @Result(column = "commit_date", property = "commitDate"),
+            @Result(column = "expected_finish_date", property = "expectedFinishDate"),
             @Result(column = "finish_date", property = "finishDate"),
             @Result(column = "pressing_type", property = "pressingType"),
             @Result(column = "user_id", property = "userId"),
@@ -227,6 +228,7 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
             @Result(column = "curing_level_id", property = "curingLevelId"),
             @Result(column = "curing_level_name", property = "curingLevelName"),
             @Result(column = "commit_date", property = "commitDate"),
+            @Result(column = "expected_finish_date", property = "expectedFinishDate"),
             @Result(column = "finish_date", property = "finishDate"),
             @Result(column = "pressing_type", property = "pressingType"),
             @Result(column = "user_id", property = "userId"),
@@ -334,6 +336,7 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
             @Result(column = "curing_level_id", property = "curingLevelId"),
             @Result(column = "curing_level_name", property = "curingLevelName"),
             @Result(column = "commit_date", property = "commitDate"),
+            @Result(column = "expected_finish_date", property = "expectedFinishDate"),
             @Result(column = "finish_date", property = "finishDate"),
             @Result(column = "pressing_type", property = "pressingType"),
             @Result(column = "user_id", property = "userId"),
@@ -452,6 +455,7 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
             @Result(column = "curing_level_id", property = "curingLevelId"),
             @Result(column = "curing_level_name", property = "curingLevelName"),
             @Result(column = "commit_date", property = "commitDate"),
+            @Result(column = "expected_finish_date", property = "expectedFinishDate"),
             @Result(column = "finish_date", property = "finishDate"),
             @Result(column = "pressing_type", property = "pressingType"),
             @Result(column = "user_id", property = "userId"),
@@ -560,6 +564,7 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
             @Result(column = "curing_level_id", property = "curingLevelId"),
             @Result(column = "curing_level_name", property = "curingLevelName"),
             @Result(column = "commit_date", property = "commitDate"),
+            @Result(column = "expected_finish_date", property = "expectedFinishDate"),
             @Result(column = "finish_date", property = "finishDate"),
             @Result(column = "pressing_type", property = "pressingType"),
             @Result(column = "user_id", property = "userId"),
@@ -56,6 +56,8 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; {
                 .likeIfPresent(MainInfoDO::getStreetName, reqVO.getStreetName())
                 .eqIfPresent(MainInfoDO::getCuringLevelId, reqVO.getCuringLevelId())
                 .likeIfPresent(MainInfoDO::getCuringLevelName, reqVO.getCuringLevelName())
+
+                .betweenIfPresent(MainInfoDO::getExpectedFinishDate, reqVO.getExpectedFinishDate())
                 .betweenIfPresent(MainInfoDO::getCommitDate, reqVO.getCommitDate())
                 .betweenIfPresent(MainInfoDO::getFinishDate, reqVO.getFinishDate())
                 .eqIfPresent(MainInfoDO::getPressingType, reqVO.getPressingType())
@@ -99,6 +101,7 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; {
                 .likeIfPresent(MainInfoDO::getStreetName, reqVO.getStreetName())
                 .eqIfPresent(MainInfoDO::getCuringLevelId, reqVO.getCuringLevelId())
                 .likeIfPresent(MainInfoDO::getCuringLevelName, reqVO.getCuringLevelName())
+                .betweenIfPresent(MainInfoDO::getExpectedFinishDate, reqVO.getExpectedFinishDate())
                 .betweenIfPresent(MainInfoDO::getCommitDate, reqVO.getCommitDate())
                 .betweenIfPresent(MainInfoDO::getFinishDate, reqVO.getFinishDate())
                 .eqIfPresent(MainInfoDO::getPressingType, reqVO.getPressingType())
@@ -129,7 +129,8 @@ public class BpmGardenServiceImpl implements BpmGardenService{
     @Transactional(rollbackFor = Exception.class)
     public Long createWorkOrderQuick(AppGardenWorkOrderReqVO createRequestVo) {
-        List<String> imgList =  createRequestVo.getImgs();
+        List<String> problemsImgsList =  createRequestVo.getProblemsImgs();//问题照片
+        List<String> endImgsList = createRequestVo.getEndImgs();//实施完成照片
         MainInfoDO workOrder = BeanUtils.toBean(createRequestVo, MainInfoDO.class)
                 .setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
@@ -164,14 +165,20 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         workOrder.setUserName(SecurityFrameworkUtils.getLoginUserNickname());
         LocalDateTime now = LocalDateTime.now();
         workOrder.setCommitDate(now);
-        workOrder.setFinishDate(now);
+        if(ObjectUtils.isNotAllEmpty(createRequestVo.getExpectedFinishDate())){
+            workOrder.setExpectedFinishDate(createRequestVo.getExpectedFinishDate());
+        }
         String workOrderNum = workOrderApi.generateWONum(BpmCommonConstant.WORK_ORDER_PREFFIX_QUICK);
         workOrder.setOrderNo(workOrderNum);
         workOrderMapper.insert(workOrder);
-        if(ObjectUtils.isNotAllEmpty(imgList) && imgList.size()>0){
-            attachmentInsertOrUpdate(imgList,BpmCommonConstant.PROBLEM_IMG_GROUP,workOrder);
+        if(ObjectUtils.isNotAllEmpty(problemsImgsList) && problemsImgsList.size()>0){
+            attachmentInsertOrUpdate(problemsImgsList,BpmCommonConstant.PROBLEM_IMG_GROUP,workOrder);
+        }
+        if(ObjectUtils.isNotAllEmpty(endImgsList) && endImgsList.size()>0){
+            attachmentInsertOrUpdate(endImgsList,BpmCommonConstant.END_IMG_GROUP,workOrder);
         }
+
         // 发起 BPM 流程
         Map<String, Object> processInstanceVariables = new HashMap<>();
         processInstanceVariables.put(COMMON_QUICK_PROCESS_INITIATOR, SecurityFrameworkUtils.getLoginUserId());
@@ -544,7 +551,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createWorkOrder(AppGardenWorkOrderReqVO createRequestVo) {
-        List<String> imgList =  createRequestVo.getImgs();
+        List<String> problemsImgsList =  createRequestVo.getProblemsImgs();
         MainInfoDO workOrder = BeanUtils.toBean(createRequestVo, MainInfoDO.class)
                 .setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
@@ -585,12 +592,14 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         }
         workOrder.setUserId(SecurityFrameworkUtils.getLoginUserId());
         workOrder.setUserName(SecurityFrameworkUtils.getLoginUserNickname());
-        //workOrder.setFinishDate(LocalDateTime.now());
+        if(ObjectUtils.isNotAllEmpty(createRequestVo.getExpectedFinishDate())){
+            workOrder.setExpectedFinishDate(createRequestVo.getExpectedFinishDate());
+        }
         String workOrderNum = workOrderApi.generateWONum(BpmCommonConstant.WORK_ORDER_PREFFIX_GARDEN);
         workOrder.setOrderNo(workOrderNum);
         workOrderMapper.insert(workOrder);
-        if(ObjectUtils.isNotAllEmpty(imgList) && imgList.size()>0){
-            attachmentInsertOrUpdate(imgList,BpmCommonConstant.PROBLEM_IMG_GROUP,workOrder);
+        if(ObjectUtils.isNotAllEmpty(problemsImgsList) && problemsImgsList.size()>0){
+            attachmentInsertOrUpdate(problemsImgsList,BpmCommonConstant.PROBLEM_IMG_GROUP,workOrder);
         }
         // 发起 BPM 流程
         Long userId = SecurityFrameworkUtils.getLoginUserId();