工单重新发起修订

颜惠青
1 parent ad792104
Showing 3 changed files with 18 additions and 9 deletions
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
@@ -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)