撤回当前任务

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcAssessController.java

@@ -85,8 +85,10 @@ public class CmcAssessController extends BaseController
         formData.put("nickName", userService.selectUserById(userId).getNickName());
         formData.put("assessId", cmcAssess.getAssessId());
         formData.put("assessTime", cmcAssess.getAssessTime());
-        formData.put("projectNumber", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectNumber());
-        formData.put("projectName", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectName());
+        if (cmcAssess.getProjectId() != null && !cmcAssess.getProjectId().equals("")){
+            formData.put("projectNumber", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectNumber());
+            formData.put("projectName", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectName());
+        }
         formData.put("deptName", deptService.selectDeptById(userService.selectUserById(userId).getDeptId()).getDeptName());
         formData.put("postGroup", userService.selectUserPostGroup(userService.selectUserById(userId).getUserName()));
         formData.put("pmlevel", userService.selectUserById(userId).getPmLevel());

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -634,6 +634,73 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      */
     @Override
     public AjaxResult revokeProcess(FlowTaskVo flowTaskVo) {
+//        if (taskService.createTaskQuery().taskId(flowTaskVo.getTaskId()).singleResult().isSuspended()) {
+//            throw new CustomException("任务处于挂起状态");
+//        }
+//        // 当前任务 task
+//        Task task = taskService.createTaskQuery().taskId(flowTaskVo.getTaskId()).singleResult();
+//        // 获取流程定义信息
+//        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(task.getProcessDefinitionId()).singleResult();
+//        // 获取所有节点信息
+//        Process process = repositoryService.getBpmnModel(processDefinition.getId()).getProcesses().get(0);
+//        // 获取全部节点列表，包含子节点
+//        Collection<FlowElement> allElements = FlowableUtils.getAllElements(process.getFlowElements(), null);
+//        // 获取当前任务节点元素
+//        FlowElement source = null;
+//        // 获取跳转的节点元素
+//        FlowElement target = null;
+//        if (allElements != null) {
+//            for (FlowElement flowElement : allElements) {
+//                // 当前任务节点元素
+//                if (flowElement.getId().equals(task.getTaskDefinitionKey())) {
+//                    source = flowElement;
+//                }
+//                // 跳转的节点元素
+//                if (flowElement.getId().equals(flowTaskVo.getTargetKey())) {
+//                    target = flowElement;
+//                }
+//            }
+//        }
+//
+//        // 从当前节点向前扫描
+//        // 如果存在路线上不存在目标节点，说明目标节点是在网关上或非同一路线上，不可跳转
+//        // 否则目标节点相对于当前节点，属于串行
+//        Boolean isSequential = FlowableUtils.iteratorCheckSequentialReferTarget(source, flowTaskVo.getTargetKey(), null, null);
+//        if (!isSequential) {
+//            throw new CustomException("当前节点相对于目标节点，不属于串行关系，无法回退");
+//        }
+//
+//
+//        // 获取所有正常进行的任务节点 Key，这些任务不能直接使用，需要找出其中需要撤回的任务
+//        List<Task> runTaskList = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).list();
+//        List<String> runTaskKeyList = new ArrayList<>();
+//        runTaskList.forEach(item -> runTaskKeyList.add(item.getTaskDefinitionKey()));
+//        // 需退回任务列表
+//        List<String> currentIds = new ArrayList<>();
+//        // 通过父级网关的出口连线，结合 runTaskList 比对，获取需要撤回的任务
+//        List<UserTask> currentUserTaskList = FlowableUtils.iteratorFindChildUserTasks(target, runTaskKeyList, null, null);
+//        currentUserTaskList.forEach(item -> currentIds.add(item.getId()));
+//
+//        // 循环获取那些需要被撤回的节点的ID，用来设置驳回原因
+//        List<String> currentTaskIds = new ArrayList<>();
+//        currentIds.forEach(currentId -> runTaskList.forEach(runTask -> {
+//            if (currentId.equals(runTask.getTaskDefinitionKey())) {
+//                currentTaskIds.add(runTask.getId());
+//            }
+//        }));
+//        // 设置回退意见
+//        currentTaskIds.forEach(currentTaskId -> taskService.addComment(currentTaskId, task.getProcessInstanceId(), FlowComment.REBACK.getType(), flowTaskVo.getComment()));
+//
+//        try {
+//            // 1 对 1 或 多 对 1 情况，currentIds 当前要跳转的节点列表(1或多)，targetKey 跳转到的节点(1)
+//            runtimeService.createChangeActivityStateBuilder()
+//                    .processInstanceId(task.getProcessInstanceId())
+//                    .moveActivityIdsToSingleActivityId(currentIds, flowTaskVo.getTargetKey()).changeState();
+//        } catch (FlowableObjectNotFoundException e) {
+//            throw new CustomException("未找到流程实例，流程可能已发生变化");
+//        } catch (FlowableException e) {
+//            throw new CustomException("无法取消或开始活动");
+//        }
         Task task = taskService.createTaskQuery().processInstanceId(flowTaskVo.getInstanceId()).singleResult();
         if (task == null) {
             throw new CustomException("流程未启动或已执行完成，无法撤回");
@@ -646,11 +713,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 .asc()
                 .list();
         String myTaskId = null;
-        HistoricTaskInstance myTask = null;
         for (HistoricTaskInstance hti : htiList) {
             if (loginUser.getUserId().toString().equals(hti.getAssignee())) {
                 myTaskId = hti.getId();
-                myTask = hti;
                 break;
             }
         }
@@ -658,28 +723,79 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             throw new CustomException("该任务非当前用户提交，无法撤回");
         }
 
-        String processDefinitionId = myTask.getProcessDefinitionId();
-        BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId);
+        // 获取流程定义信息
+        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(task.getProcessDefinitionId()).singleResult();
+        // 获取所有节点信息
+        Process process = repositoryService.getBpmnModel(processDefinition.getId()).getProcesses().get(0);
+        // 获取全部节点列表，包含子节点
+        Collection<FlowElement> allElements = FlowableUtils.getAllElements(process.getFlowElements(), null);
+        // 获取当前任务节点元素
+        FlowElement source = null;
+        // 获取跳转的节点元素
+        FlowElement target = null;
+        if (allElements != null) {
+            for (FlowElement flowElement : allElements) {
+                // 当前任务节点元素
+                if (flowElement.getId().equals(task.getTaskDefinitionKey())) {
+                    source = flowElement;
+                }
+            }
+        }
 
-        //变量
-//      Map<String, VariableInstance> variables = runtimeService.getVariableInstances(currentTask.getExecutionId());
-        String myActivityId = null;
-        List<HistoricActivityInstance> haiList = historyService.createHistoricActivityInstanceQuery()
-                .executionId(myTask.getExecutionId()).finished().list();
-        for (HistoricActivityInstance hai : haiList) {
-            if (myTaskId.equals(hai.getTaskId())) {
-                myActivityId = hai.getActivityId();
-                break;
+        List<UserTask> parentUserTaskList = FlowableUtils.iteratorFindParentUserTasks(source, null, null);
+        //仅考虑撤回到其中一个用户任务节点，在没有会签、并行等情况下可以用
+        String targetTaskDefinitionId = parentUserTaskList.get(0).getId();
+        if (allElements != null) {
+            for (FlowElement flowElement : allElements) {
+                // 跳转的节点元素
+                if (flowElement.getId().equals(targetTaskDefinitionId)) {
+                    target = flowElement;
+                }
             }
         }
-        FlowNode myFlowNode = (FlowNode) bpmnModel.getMainProcess().getFlowElement(myActivityId);
 
-        Execution execution = runtimeService.createExecutionQuery().executionId(task.getExecutionId()).singleResult();
-        String activityId = execution.getActivityId();
-        FlowNode flowNode = (FlowNode) bpmnModel.getMainProcess().getFlowElement(activityId);
+        // 获取所有正常进行的任务节点 Key，这些任务不能直接使用，需要找出其中需要撤回的任务
+        List<Task> runTaskList = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).list();
+        List<String> runTaskKeyList = new ArrayList<>();
+        runTaskList.forEach(item -> runTaskKeyList.add(item.getTaskDefinitionKey()));
+        // 需退回任务列表
+        List<String> currentIds = new ArrayList<>();
+        // 通过父级网关的出口连线，结合 runTaskList 比对，获取需要撤回的任务
+        List<UserTask> currentUserTaskList = FlowableUtils.iteratorFindChildUserTasks(target, runTaskKeyList, null, null);
+        currentUserTaskList.forEach(item -> currentIds.add(item.getId()));
 
-        //记录原活动方向
-        List<SequenceFlow> oriSequenceFlows = new ArrayList<>(flowNode.getOutgoingFlows());
+        try {
+            // 1 对 1 或 多 对 1 情况，currentIds 当前要跳转的节点列表(1或多)，targetKey 跳转到的节点(1)
+            runtimeService.createChangeActivityStateBuilder()
+                    .processInstanceId(task.getProcessInstanceId())
+                    .moveActivityIdsToSingleActivityId(currentIds, targetTaskDefinitionId).changeState();
+        } catch (FlowableObjectNotFoundException e) {
+            throw new CustomException("未找到流程实例，流程可能已发生变化");
+        } catch (FlowableException e) {
+            throw new CustomException("无法取消或开始活动");
+        }
+//        String processDefinitionId = myTask.getProcessDefinitionId();
+//        BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId);
+//
+//        //变量
+////      Map<String, VariableInstance> variables = runtimeService.getVariableInstances(currentTask.getExecutionId());
+//        String myActivityId = null;
+//        List<HistoricActivityInstance> haiList = historyService.createHistoricActivityInstanceQuery()
+//                .executionId(myTask.getExecutionId()).finished().list();
+//        for (HistoricActivityInstance hai : haiList) {
+//            if (myTaskId.equals(hai.getTaskId())) {
+//                myActivityId = hai.getActivityId();
+//                break;
+//            }
+//        }
+//        FlowNode myFlowNode = (FlowNode) bpmnModel.getMainProcess().getFlowElement(myActivityId);
+//
+//        Execution execution = runtimeService.createExecutionQuery().executionId(task.getExecutionId()).singleResult();
+//        String activityId = execution.getActivityId();
+//        FlowNode flowNode = (FlowNode) bpmnModel.getMainProcess().getFlowElement(activityId);
+//
+//        //记录原活动方向
+//        List<SequenceFlow> oriSequenceFlows = new ArrayList<>(flowNode.getOutgoingFlows());
 
 
         return AjaxResult.success();