三海道路重新发起 ai 和督察员选择非三海的道路找不到养护组长问题

颜惠青
1 parent 3c0d0640
Showing 5 changed files with 55 additions and 2 deletions
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderAIController.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderInspectorController.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/task/AppGardenTaskInspectorApproveReqVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIServiceImpl.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java
@@ -234,6 +234,7 @@ public class AppGardenWorkOrderAIController {
                 reStartReqVO.setReason(reqVO.getReason());
                 reStartReqVO.setId(reqVO.getTaskId());
                 reStartReqVO.setRoadId(reqVO.getRoadId());
+                reStartReqVO.setBusiLine(reqVO.getBusiLine());
                 aiService.approveTask(reStartReqVO);
                 log.info("当前操作："+AIOperateTypeEnum.YL_INSPECTOR_START_RELAUNCH.getDesc()+"<--结束");
                 return success(true);
@@ -235,6 +235,7 @@ public class AppGardenWorkOrderInspectorController {
                 reStartReqVO.setReason(reqVO.getReason());
                 reStartReqVO.setId(reqVO.getTaskId());
                 reStartReqVO.setRoadId(reqVO.getRoadId());
+                reStartReqVO.setBusiLine(reqVO.getBusiLine());
                 inspectorService.approveTask(reStartReqVO);
                 log.info("当前操作："+InspectorOperateTypeEnum.YL_INSPECTOR_START_RELAUNCH.getDesc()+"<--结束");
                 return success(true);
@@ -48,4 +48,7 @@ public class AppGardenTaskInspectorApproveReqVO {
     @Schema(description = "退回时的拍照图片")
     private List<String> returnImgs;
+    @Schema(description = "业务线")
+    private String busiLine;
+
 }
 \ No newline at end of file
@@ -295,6 +295,31 @@ public class BpmAIServiceImpl implements BpmAIService{
             //重新发起判断 三海区域
             boolean isSanhai = isSanhaiByRoadId(reqVO.getRoadId());
             variables.put(BPM_COMMON_PROD_ISSANHAI,isSanhai);
+            if(!isSanhai){//非三海的到养护组长
+                String instanceId = taskService.getTask(reqVO.getId()).getProcessInstanceId();
+                ProcessInstance processInstance = processInstanceService.getProcessInstance(instanceId);
+                Map<String, Object> processInstanceVariables =  processInstance.getProcessVariables();
+                String busiLine = reqVO.getBusiLine();
+                String roadId = reqVO.getRoadId();
+                String roleCode = BusiLineTeamLeaderRoleCodeEnum.getByCode(busiLine).getRoleCode();
+
+                if(StringUtil.isEmpty(roleCode)){// 找不到 默认为园林组长的角色
+                    roleCode = BpmCommonConstant.TEAM_LEADER_YL;
+                }
+                List<AdminUserRespDTO> userList = workOrderExtMapper.getUserByRoadIdAndRoleCode(roadId,roleCode,busiLine);
+                if(org.springframework.util.ObjectUtils.isEmpty(userList)){
+                    throw exception(TEAM_LEADER_YL_NOT_EXISTS);
+                }
+                // 提取id到List<Long>
+                List<Long> idList = userList.stream()
+                        // 映射：将AdminUserRespDTO对象转为其id属性
+                        .map(AdminUserRespDTO::getId)
+                        // 收集结果到List
+                        .collect(Collectors.toList());
+                processInstanceVariables.put(BPM_COMMON_PROD_LEADERID, idList.get(0));//养护组长分配
+                //流程变量重新赋值
+                runtimeService.setVariables(instanceId,processInstanceVariables);
+            }
         }
         //TODO  重新发起需更新工单数据库
@@ -287,9 +287,32 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{
             //重新发起判断 三海区域
             boolean isSanhai = isSanhaiByRoadId(reqVO.getRoadId());
             variables.put(BPM_COMMON_PROD_ISSANHAI,isSanhai);
-        }
-        //TODO  重新发起需更新工单数据库
+            if(!isSanhai){//非三海的到养护组长
+                String instanceId = taskService.getTask(reqVO.getId()).getProcessInstanceId();
+                ProcessInstance processInstance = processInstanceService.getProcessInstance(instanceId);
+                Map<String, Object> processInstanceVariables =  processInstance.getProcessVariables();
+                String busiLine = reqVO.getBusiLine();
+                String roadId = reqVO.getRoadId();
+                String roleCode = BusiLineTeamLeaderRoleCodeEnum.getByCode(busiLine).getRoleCode();
+                if(StringUtil.isEmpty(roleCode)){// 找不到 默认为园林组长的角色
+                    roleCode = BpmCommonConstant.TEAM_LEADER_YL;
+                }
+                List<AdminUserRespDTO> userList = workOrderExtMapper.getUserByRoadIdAndRoleCode(roadId,roleCode,busiLine);
+                if(org.springframework.util.ObjectUtils.isEmpty(userList)){
+                    throw exception(TEAM_LEADER_YL_NOT_EXISTS);
+                }
+                // 提取id到List<Long>
+                List<Long> idList = userList.stream()
+                        // 映射：将AdminUserRespDTO对象转为其id属性
+                        .map(AdminUserRespDTO::getId)
+                        // 收集结果到List
+                        .collect(Collectors.toList());
+                processInstanceVariables.put(BPM_COMMON_PROD_LEADERID, idList.get(0));//养护组长分配
+                //流程变量重新赋值
+                runtimeService.setVariables(instanceId,processInstanceVariables);
+            }
+        }
         targetVO.setVariables(variables);
         //TODO 审批候选人需要赋值
         Map<String, List<Long>> nextAssignees = new HashMap<>();