修改流程图，串行驳回设置流程表达式

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

@@ -107,7 +107,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.DELEGATE.getType(), taskVo.getComment());
                 taskService.resolveTask(taskVo.getTaskId(), taskVo.getVariables());
             } else {
-                taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.NORMAL.getType(), taskVo.getComment());
+                taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.NORMAL.getRemark(), taskVo.getComment());
                 Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
                 taskService.setAssignee(taskVo.getTaskId(), userId.toString());
                 taskService.complete(taskVo.getTaskId(), taskVo.getVariables());
@@ -215,7 +215,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             }
         }));
         // 设置驳回意见
-        currentTaskIds.forEach(item -> taskService.addComment(item, task.getProcessInstanceId(), FlowComment.REJECT.getType(), flowTaskVo.getComment()));
+        currentTaskIds.forEach(item -> taskService.addComment(item, task.getProcessInstanceId(), FlowComment.REJECT.getRemark(), flowTaskVo.getComment()));
 
         try {
             // 如果父级任务多于 1 个，说明当前节点不是并行节点，原因为不考虑多对多情况
@@ -303,7 +303,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             }
         }));
         // 设置回退意见
-        currentTaskIds.forEach(currentTaskId -> taskService.addComment(currentTaskId, task.getProcessInstanceId(), FlowComment.REBACK.getType(), flowTaskVo.getComment()));
+        currentTaskIds.forEach(currentTaskId -> taskService.addComment(currentTaskId, task.getProcessInstanceId(), FlowComment.REBACK.getRemark(), flowTaskVo.getComment()));
 
         try {
             // 1 对 1 或 多 对 1 情况，currentIds 当前要跳转的节点列表(1或多)，targetKey 跳转到的节点(1)
@@ -634,73 +634,6 @@ 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("流程未启动或已执行完成，无法撤回");