Merge remote-tracking branch 'origin/dev' into dev

wangqian
2 parents 06f4dc16 6cd70385
Showing 14 changed files with 83 additions and 26 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/api/workorder/WorkOrderApiImpl.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/controller/app/garden/AppGardenWorkOrderController.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/BuzStatusUpdateAspect.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/common/AppUniversalApprovalReqVO.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/enums/ErrorCodeConstants.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;
@@ -72,6 +72,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());
@@ -77,6 +77,10 @@ public class WorkOrderApiImpl implements WorkOrderApi {
     @Override
     public AppGardenWorkOrderRespVO createWorkOrder(AppGardenWorkOrderReqVO createRequestVo) {
+        if(createRequestVo.getOrderType().equals(BpmCommonConstant.ORDER_TYPE_Q)){
+            BpmGardenWorkOrderDO targetVO = gardenService.getWorkOrder(gardenService.createWorkOrderQuick(createRequestVo));
+            return BeanUtils.toBean(targetVO,AppGardenWorkOrderRespVO.class);
+        }
         BpmGardenWorkOrderDO targetVO = gardenService.getWorkOrder(gardenService.createWorkOrder(createRequestVo));
         return BeanUtils.toBean(targetVO,AppGardenWorkOrderRespVO.class);
     }
@@ -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;
@@ -31,6 +31,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
@@ -250,6 +251,7 @@ public class AppGardenWorkOrderController {
     @Operation(summary = "app-统一审批入口")
     @PostMapping("/universalApproval")
     @AutoUpdateWorkerOrderBuzStatus
+    @Transactional(rollbackFor = Exception.class)
     //@PreAuthorize("@ss.hasPermission('bpm:garden-workorder:update')")
     public CommonResult<Boolean> universalApproval(@Valid @RequestBody AppUniversalApprovalReqVO reqVO) {
@@ -271,7 +273,7 @@ public class AppGardenWorkOrderController {
                 log.info("当前操作："+OperateTypeEnum.YL_WORKER_RETURN.getDesc()+"<--结束");
                 return success(true);
             case YL_WORKER_IMPLEMENT://养护员实施 需修改更新工单数据 见切面
-                log.info("当前操作："+OperateTypeEnum.YL_WORKER_IMPLEMENT.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_WORKER_RETURN.getCode()+"-->");
+                log.info("当前操作："+OperateTypeEnum.YL_WORKER_IMPLEMENT.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_WORKER_IMPLEMENT.getCode()+"-->");
                 AppGardenTaskWorkerExcuteReqVO workerExcuteReqVO = new AppGardenTaskWorkerExcuteReqVO();
                 workerExcuteReqVO.setWorkerDataId(reqVO.getWorkerDataId());
                 workerExcuteReqVO.setId(reqVO.getTaskId());
@@ -287,7 +289,7 @@ public class AppGardenWorkOrderController {
                 log.info("当前操作："+OperateTypeEnum.YL_WORKER_IMPLEMENT.getDesc()+"<--结束");
                 return success(true);
             case YL_TEAM_LEADER_CONFIRM_PASS://养护组长验收通过
-                log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_PASS.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_WORKER_RETURN.getCode()+"-->");
+                log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_PASS.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_PASS.getCode()+"-->");
                 AppGardenTaskApproveReqVO approveReqVO = new AppGardenTaskApproveReqVO();
                 approveReqVO.setReason(reqVO.getReason());
                 approveReqVO.setId(reqVO.getTaskId());
@@ -295,7 +297,7 @@ public class AppGardenWorkOrderController {
                 log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_PASS.getDesc()+"<--结束");
                 return success(true);
             case YL_TEAM_LEADER_CONFIRM_REJECT://养护组长验收不通过 需修改更新工单数据 见切面
-                log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_REJECT.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_WORKER_RETURN.getCode()+"-->");
+                log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_REJECT.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_REJECT.getCode()+"-->");
                 AppGardenTaskReturnExtReqVO rejReqVO = new AppGardenTaskReturnExtReqVO();
                 rejReqVO.setId(reqVO.getTaskId());
                 rejReqVO.setCurTaskKey(reqVO.getTaskKey());
@@ -305,7 +307,7 @@ public class AppGardenWorkOrderController {
                 log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_REJECT.getDesc()+"<--结束");
                 return success(true);
             case YL_TEAM_LEADER_ASSIGN: //养护组长分配 需修改更新工单数据 见切面
-                log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_ASSIGN.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_WORKER_RETURN.getCode()+"-->");
+                log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_ASSIGN.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_TEAM_LEADER_ASSIGN.getCode()+"-->");
                 AppGardenTaskTeamLeaderAssignReqVO assignReqVO = new AppGardenTaskTeamLeaderAssignReqVO();
                 assignReqVO.setId(reqVO.getTaskId());
                 assignReqVO.setReason(reqVO.getReason());
@@ -324,7 +326,7 @@ public class AppGardenWorkOrderController {
                 return success(true);
             case YL_TEAM_LEADER_RETURN://养护组长退回
-                log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_RETURN.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_WORKER_RETURN.getCode()+"-->");
+                log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_RETURN.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_TEAM_LEADER_RETURN.getCode()+"-->");
                 AppGardenTaskApproveReqVO returnApproveReqVO = new AppGardenTaskApproveReqVO();
                 Integer approveStatus = reqVO.getAgree();
                 if (approveStatus == null || (approveStatus != 0 && approveStatus != 1)) {
@@ -350,7 +352,7 @@ public class AppGardenWorkOrderController {
                 log.info("当前操作："+OperateTypeEnum.YL_INSPECTOR_START_FINISH.getDesc()+"<--结束");
                 return success(true);
             case YL_INSPECTOR_START_RELAUNCH : //巡查员重新发起 需修改更新工单数据 见切面
-                log.info("当前操作："+OperateTypeEnum.YL_INSPECTOR_START_RELAUNCH.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_WORKER_RETURN.getCode()+"-->");
+                log.info("当前操作："+OperateTypeEnum.YL_INSPECTOR_START_RELAUNCH.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_INSPECTOR_START_RELAUNCH.getCode()+"-->");
                 AppGardenTaskApproveReqVO reStartReqVO = new AppGardenTaskApproveReqVO();
                 Integer reStatus = reqVO.getAgree();
                 if (reStatus == null || (reStatus != 0 && reStatus != 1)) {
@@ -95,7 +95,8 @@ public class BuzStatusUpdateAspect {
         //重新发起需更新表单数据
         if(OperateTypeEnum.YL_INSPECTOR_START_RELAUNCH.getCode().equals(operateType.getCode())){
             RoadStreetRespDTO roadStreetRespDTO = roadApi.getRoadInfoById(reqVO.getRoadId());
-
+            targeVO = BeanUtils.toBean(reqVO,MainInfoDO.class);
+            targeVO.setId(reqVO.getWorkerDataId());
             targeVO.setStreetId(roadStreetRespDTO.getStreetId());
             targeVO.setStreetName(roadStreetRespDTO.getStreetName());
             DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString());
@@ -110,7 +111,7 @@ public class BuzStatusUpdateAspect {
             targeVO.setUserId(SecurityFrameworkUtils.getLoginUserId());
             targeVO.setUserName(SecurityFrameworkUtils.getLoginUserNickname());
             targeVO.setFinishDate(reqVO.getFinishDate());
-            List<String> problemsImgs = reqVO.getProblemsImgs();
+            List<String> problemsImgs = reqVO.getImgs();
             if(ObjectUtils.isNotAllEmpty(problemsImgs) && problemsImgs.size()>0){
                 gardenService.attachmentInsertOrUpdate(problemsImgs,BpmCommonConstant.PROBLEM_IMG_GROUP,targeVO);
             }
@@ -121,6 +122,7 @@ public class BuzStatusUpdateAspect {
         }
         //养护组长验收不通过 需更新表单数据
         if(OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_REJECT.getCode().equals(operateType.getCode())){
+
             List<String> returnImgs = reqVO.getReturnImgs();
             if(ObjectUtils.isNotAllEmpty(returnImgs) && returnImgs.size()>0){
                 gardenService.attachmentInsertOrUpdate(returnImgs,BpmCommonConstant.GARDEN_TEAMLEADER_RETURN_IMG,targeVO);
@@ -128,6 +130,8 @@ public class BuzStatusUpdateAspect {
         }
         //养护员实施 需更新表单数据
         if(OperateTypeEnum.YL_WORKER_IMPLEMENT.getCode().equals(operateType.getCode())){
+            //实施更新为实施人员部门
+            targeVO.setDeptId(SecurityFrameworkUtils.getDeptId());
             //实施 审批已经执行 此处就无需执行
             /*
             List<String> problemsImgs = reqVO.getProblemsImgs();
@@ -69,6 +69,9 @@ public class AppUniversalApprovalReqVO {
     //@NotEmpty(message = "处理意见不能为空", groups = RelaunchGroup.class)
     private String handleResult;
+    @Schema(description = "开始的问题拍照图片")
+    private List<String> problemsImgs;
+
     @Schema(description = "实施开始的拍照图片")
     private List<String> startImgs;
@@ -93,7 +96,7 @@ public class AppUniversalApprovalReqVO {
     private String roadName;
     @Schema(description = "开始的问题拍照图片")
-    private List<String> problemsImgs;
+    private List<String> imgs;
     @Schema(description = "工单描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对")
     @NotEmpty(message = "工单描述不能为空", groups = RelaunchGroup.class)
@@ -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"),
@@ -44,8 +44,8 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; {
                 .eqIfPresent(MainInfoDO::getRootCauseBy, reqVO.getRootCauseBy())
                 .eqIfPresent(MainInfoDO::getOrderType, reqVO.getOrderType())
-                .eqIfPresent(MainInfoDO::getWorkerCompanyId, reqVO.getWorkerName())
-                .eqIfPresent(MainInfoDO::getWorkerId, reqVO.getOrderType())
+                .eqIfPresent(MainInfoDO::getWorkerCompanyId, reqVO.getWorkerCompanyId())
+                .eqIfPresent(MainInfoDO::getWorkerId, reqVO.getWorkerId())
                 .likeIfPresent(MainInfoDO::getWorkerName, reqVO.getWorkerName())
                 .eqIfPresent(MainInfoDO::getSourceId, reqVO.getSourceId())
@@ -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())
@@ -86,8 +88,8 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; {
                 .eqIfPresent(MainInfoDO::getRootCauseBy, reqVO.getRootCauseBy())
                 .eqIfPresent(MainInfoDO::getOrderType, reqVO.getOrderType())
-                .eqIfPresent(MainInfoDO::getWorkerCompanyId, reqVO.getWorkerName())
-                .eqIfPresent(MainInfoDO::getWorkerId, reqVO.getOrderType())
+                .eqIfPresent(MainInfoDO::getWorkerCompanyId, reqVO.getWorkerCompanyId())
+                .eqIfPresent(MainInfoDO::getWorkerId, reqVO.getWorkerId())
                 .likeIfPresent(MainInfoDO::getWorkerName, reqVO.getWorkerName())
                 .eqIfPresent(MainInfoDO::getWoSourceId, reqVO.getWoSourceId())
@@ -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())
@@ -29,5 +29,7 @@ public interface ErrorCodeConstants {
     ErrorCode  APP_WORKER_LEVEL_ID_NOT_EXISTS = new ErrorCode(1-900-002-000, "养护级别编码错误，不存在！");
-    ErrorCode  APP_USER_ROLE_NOT_EXISTS= new ErrorCode(1-900-002-001, "该人员未分配角色 ！");
+    ErrorCode  APP_USER_ROLE_NOT_EXISTS = new ErrorCode(1-900-002-001, "该人员未分配角色 ！");
+
+    ErrorCode  APP_WORK_ORADER_ERROR = new ErrorCode(1-900-002-002, "工单类型错误，快速工单无法走此流程 ！");
 }
@@ -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());
@@ -554,8 +561,11 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         workOrder.setStreetName(roadStreetRespDTO.getStreetName());
         workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum
         if(StringUtil.isEmpty(createRequestVo.getOrderType())){
-            workOrder.setOrderType(BpmCommonConstant.ORDER_TYPE_Q);
+            workOrder.setOrderType(BpmCommonConstant.ORDER_TYPE_C);
         }else{
+            if(createRequestVo.getOrderType().equals(BpmCommonConstant.ORDER_TYPE_Q)){
+                throw exception(APP_WORK_ORADER_ERROR);
+            }
             workOrder.setOrderType(createRequestVo.getOrderType());
         }
         DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString());
@@ -582,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();