BJ_FS / urbanops

Commit d6a815aa951439262c0f116c13ae3da7be22f980

Authored by 颜惠青
1 parent ad792104

工单重新发起 修订

Inline Side-by-side
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
  View file @d6a815a
... ... @@ -31,6 +31,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
31 31 import jakarta.annotation.Resource;
32 32 import jakarta.validation.Valid;
33 33 import lombok.extern.slf4j.Slf4j;
  34 +import org.springframework.transaction.annotation.Transactional;
34 35 import org.springframework.web.bind.annotation.*;
35 36  
36 37 import java.util.List;
... ... @@ -250,6 +251,7 @@ public class AppGardenWorkOrderController {
250 251 @Operation(summary = "app-统一审批入口")
251 252 @PostMapping("/universalApproval")
252 253 @AutoUpdateWorkerOrderBuzStatus
  254 + @Transactional(rollbackFor = Exception.class)
253 255 //@PreAuthorize("@ss.hasPermission('bpm:garden-workorder:update')")
254 256 public CommonResult<Boolean> universalApproval(@Valid @RequestBody AppUniversalApprovalReqVO reqVO) {
255 257  
... ... @@ -271,7 +273,7 @@ public class AppGardenWorkOrderController {
271 273 log.info("当前操作："+OperateTypeEnum.YL_WORKER_RETURN.getDesc()+"<--结束");
272 274 return success(true);
273 275 case YL_WORKER_IMPLEMENT://养护员实施 需修改更新工单数据 见切面
274   - log.info("当前操作："+OperateTypeEnum.YL_WORKER_IMPLEMENT.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_WORKER_RETURN.getCode()+"-->");
  276 + log.info("当前操作："+OperateTypeEnum.YL_WORKER_IMPLEMENT.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_WORKER_IMPLEMENT.getCode()+"-->");
275 277 AppGardenTaskWorkerExcuteReqVO workerExcuteReqVO = new AppGardenTaskWorkerExcuteReqVO();
276 278 workerExcuteReqVO.setWorkerDataId(reqVO.getWorkerDataId());
277 279 workerExcuteReqVO.setId(reqVO.getTaskId());
... ... @@ -287,7 +289,7 @@ public class AppGardenWorkOrderController {
287 289 log.info("当前操作："+OperateTypeEnum.YL_WORKER_IMPLEMENT.getDesc()+"<--结束");
288 290 return success(true);
289 291 case YL_TEAM_LEADER_CONFIRM_PASS://养护组长验收通过
290   - log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_PASS.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_WORKER_RETURN.getCode()+"-->");
  292 + log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_PASS.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_PASS.getCode()+"-->");
291 293 AppGardenTaskApproveReqVO approveReqVO = new AppGardenTaskApproveReqVO();
292 294 approveReqVO.setReason(reqVO.getReason());
293 295 approveReqVO.setId(reqVO.getTaskId());
... ... @@ -295,7 +297,7 @@ public class AppGardenWorkOrderController {
295 297 log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_PASS.getDesc()+"<--结束");
296 298 return success(true);
297 299 case YL_TEAM_LEADER_CONFIRM_REJECT://养护组长验收不通过 需修改更新工单数据 见切面
298   - log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_REJECT.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_WORKER_RETURN.getCode()+"-->");
  300 + log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_REJECT.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_REJECT.getCode()+"-->");
299 301 AppGardenTaskReturnExtReqVO rejReqVO = new AppGardenTaskReturnExtReqVO();
300 302 rejReqVO.setId(reqVO.getTaskId());
301 303 rejReqVO.setCurTaskKey(reqVO.getTaskKey());
... ... @@ -305,7 +307,7 @@ public class AppGardenWorkOrderController {
305 307 log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_REJECT.getDesc()+"<--结束");
306 308 return success(true);
307 309 case YL_TEAM_LEADER_ASSIGN: //养护组长分配 需修改更新工单数据 见切面
308   - log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_ASSIGN.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_WORKER_RETURN.getCode()+"-->");
  310 + log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_ASSIGN.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_TEAM_LEADER_ASSIGN.getCode()+"-->");
309 311 AppGardenTaskTeamLeaderAssignReqVO assignReqVO = new AppGardenTaskTeamLeaderAssignReqVO();
310 312 assignReqVO.setId(reqVO.getTaskId());
311 313 assignReqVO.setReason(reqVO.getReason());
... ... @@ -324,7 +326,7 @@ public class AppGardenWorkOrderController {
324 326 return success(true);
325 327  
326 328 case YL_TEAM_LEADER_RETURN://养护组长退回
327   - log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_RETURN.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_WORKER_RETURN.getCode()+"-->");
  329 + log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_RETURN.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_TEAM_LEADER_RETURN.getCode()+"-->");
328 330 AppGardenTaskApproveReqVO returnApproveReqVO = new AppGardenTaskApproveReqVO();
329 331 Integer approveStatus = reqVO.getAgree();
330 332 if (approveStatus == null || (approveStatus != 0 && approveStatus != 1)) {
... ... @@ -350,7 +352,7 @@ public class AppGardenWorkOrderController {
350 352 log.info("当前操作："+OperateTypeEnum.YL_INSPECTOR_START_FINISH.getDesc()+"<--结束");
351 353 return success(true);
352 354 case YL_INSPECTOR_START_RELAUNCH : //巡查员重新发起 需修改更新工单数据 见切面
353   - log.info("当前操作："+OperateTypeEnum.YL_INSPECTOR_START_RELAUNCH.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_WORKER_RETURN.getCode()+"-->");
  355 + log.info("当前操作："+OperateTypeEnum.YL_INSPECTOR_START_RELAUNCH.getDesc()+"开始，操作类型："+OperateTypeEnum.YL_INSPECTOR_START_RELAUNCH.getCode()+"-->");
354 356 AppGardenTaskApproveReqVO reStartReqVO = new AppGardenTaskApproveReqVO();
355 357 Integer reStatus = reqVO.getAgree();
356 358 if (reStatus == null || (reStatus != 0 && reStatus != 1)) {
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/BuzStatusUpdateAspect.java
  View file @d6a815a
... ... @@ -95,7 +95,8 @@ public class BuzStatusUpdateAspect {
95 95 //重新发起需更新表单数据
96 96 if(OperateTypeEnum.YL_INSPECTOR_START_RELAUNCH.getCode().equals(operateType.getCode())){
97 97 RoadStreetRespDTO roadStreetRespDTO = roadApi.getRoadInfoById(reqVO.getRoadId());
98   -
  98 + targeVO = BeanUtils.toBean(reqVO,MainInfoDO.class);
  99 + targeVO.setId(reqVO.getWorkerDataId());
99 100 targeVO.setStreetId(roadStreetRespDTO.getStreetId());
100 101 targeVO.setStreetName(roadStreetRespDTO.getStreetName());
101 102 DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString());
... ... @@ -110,7 +111,7 @@ public class BuzStatusUpdateAspect {
110 111 targeVO.setUserId(SecurityFrameworkUtils.getLoginUserId());
111 112 targeVO.setUserName(SecurityFrameworkUtils.getLoginUserNickname());
112 113 targeVO.setFinishDate(reqVO.getFinishDate());
113   - List<String> problemsImgs = reqVO.getProblemsImgs();
  114 + List<String> problemsImgs = reqVO.getImgs();
114 115 if(ObjectUtils.isNotAllEmpty(problemsImgs) && problemsImgs.size()>0){
115 116 gardenService.attachmentInsertOrUpdate(problemsImgs,BpmCommonConstant.PROBLEM_IMG_GROUP,targeVO);
116 117 }
... ... @@ -121,6 +122,7 @@ public class BuzStatusUpdateAspect {
121 122 }
122 123 //养护组长验收不通过 需更新表单数据
123 124 if(OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_REJECT.getCode().equals(operateType.getCode())){
  125 +
124 126 List<String> returnImgs = reqVO.getReturnImgs();
125 127 if(ObjectUtils.isNotAllEmpty(returnImgs) && returnImgs.size()>0){
126 128 gardenService.attachmentInsertOrUpdate(returnImgs,BpmCommonConstant.GARDEN_TEAMLEADER_RETURN_IMG,targeVO);
... ... @@ -128,6 +130,8 @@ public class BuzStatusUpdateAspect {
128 130 }
129 131 //养护员实施 需更新表单数据
130 132 if(OperateTypeEnum.YL_WORKER_IMPLEMENT.getCode().equals(operateType.getCode())){
  133 + //实施更新为实施人员部门
  134 + targeVO.setDeptId(SecurityFrameworkUtils.getDeptId());
131 135 //实施 审批已经执行 此处就无需执行
132 136 /*
133 137 List<String> problemsImgs = reqVO.getProblemsImgs();
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/common/AppUniversalApprovalReqVO.java
  View file @d6a815a
... ... @@ -69,6 +69,9 @@ public class AppUniversalApprovalReqVO {
69 69 //@NotEmpty(message = "处理意见不能为空", groups = RelaunchGroup.class)
70 70 private String handleResult;
71 71  
  72 + @Schema(description = "开始的问题拍照图片")
  73 + private List<String> problemsImgs;
  74 +
72 75 @Schema(description = "实施开始的拍照图片")
73 76 private List<String> startImgs;
74 77  
... ... @@ -93,7 +96,7 @@ public class AppUniversalApprovalReqVO {
93 96 private String roadName;
94 97  
95 98 @Schema(description = "开始的问题拍照图片")
96   - private List<String> problemsImgs;
  99 + private List<String> imgs;
97 100  
98 101 @Schema(description = "工单描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对")
99 102 @NotEmpty(message = "工单描述不能为空", groups = RelaunchGroup.class)
... ...