如果下个节点已办，不允许撤回，修改流程图高亮显示

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

@@ -137,7 +137,6 @@ public class CmcDeviceApprovalController extends BaseController
             cmcDeviceApproval.setDispatchTime(new Date());
         }
         if (formDataJson.getJSONArray("modifyDevices").size() > 0) {
-            cmcDeviceApproval.setDispatcher(getLoginUser().getUserId());
             String deviceString = formDataJson.getString("modifyDevices").substring(1, formDataJson.getString("modifyDevices").length() - 1);
             cmcDeviceApproval.setModifyDevices(deviceString);
             String[] devices = deviceString.split(",");

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/FindNextNodeUtil.java

@@ -12,6 +12,7 @@ import org.flowable.engine.RepositoryService;
 import org.flowable.engine.TaskService;
 import org.flowable.engine.repository.Model;
 import org.flowable.engine.repository.ProcessDefinition;
+import org.flowable.task.api.history.HistoricTaskInstance;
 
 import java.util.*;
 
@@ -40,6 +41,25 @@ public class FindNextNodeUtil {
         return data;
     }
 
+    /**
+     * 获取下一步骤的用户任务
+     *
+     * @param repositoryService
+     * @param map
+     * @return
+     */
+    public static List<UserTask> getNextUserTasksByHistTask(RepositoryService repositoryService, HistoricTaskInstance task, Map<String, Object> map) {
+        List<UserTask> data = new ArrayList<>();
+        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(task.getProcessDefinitionId()).singleResult();
+        BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinition.getId());
+        Process mainProcess = bpmnModel.getMainProcess();
+        Collection<FlowElement> flowElements = mainProcess.getFlowElements();
+        String key = task.getTaskDefinitionKey();
+        FlowElement flowElement = bpmnModel.getFlowElement(key);
+        next(flowElements, flowElement, map, data);
+        return data;
+    }
+
     /**
      * 启动流程时获取下一步骤的用户任务
      *

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

@@ -48,6 +48,7 @@ import org.flowable.engine.runtime.ActivityInstance;
 import org.flowable.engine.runtime.Execution;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.engine.task.Comment;
+import org.flowable.identitylink.api.IdentityLinkInfo;
 import org.flowable.identitylink.api.history.HistoricIdentityLink;
 import org.flowable.image.ProcessDiagramGenerator;
 import org.flowable.task.api.DelegationState;
@@ -644,7 +645,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      */
     @Override
     public AjaxResult revokeProcess(FlowTaskVo flowTaskVo) {
-        Task task = taskService.createTaskQuery().processInstanceId(flowTaskVo.getInstanceId()).singleResult();
+        HistoricTaskInstance task = historyService.createHistoricTaskInstanceQuery().taskId(flowTaskVo.getTaskId()).singleResult();
         if (task == null) {
             throw new CustomException("流程未启动或已执行完成，无法撤回");
         }
@@ -656,34 +657,40 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 .asc()
                 .list();
         String myTaskId = null;
+        String nextUserTaskId = null;
+        Map<String, Object> currentVariables = taskService.getVariables(taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getId());
+        List<UserTask> nextUserTask = FindNextNodeUtil.getNextUserTasksByHistTask(repositoryService, task, currentVariables);
+
         for (HistoricTaskInstance hti : htiList) {
             if (loginUser.getUserId().toString().equals(hti.getAssignee())) {
                 myTaskId = hti.getId();
                 break;
             }
         }
+        for (HistoricTaskInstance hti : htiList) {
+            if (CollectionUtils.isNotEmpty(nextUserTask)) {
+                for (UserTask userTask : nextUserTask) {
+                    if (userTask.getId().equals(hti.getTaskDefinitionKey()) && hti.getEndTime() != null && hti.getDeleteReason() == null) {
+                        nextUserTaskId = task.getTaskDefinitionKey();
+                        break;
+                    }
+                }
+            }
+        }
         if (null == myTaskId) {
             throw new CustomException("该任务非当前用户提交，无法撤回");
         }
-
+        if (nextUserTaskId != null) {
+            throw new CustomException("下一节点已办理，无法撤回");
+        }
         // 获取流程定义信息
         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;
-                }
-            }
-        }
 
         //仅考虑撤回到其中一个用户任务节点，在没有会签、并行等情况下可以用
         List<HistoricTaskInstance> historicTaskInstanceList = historyService.createHistoricTaskInstanceQuery().processInstanceId(task.getProcessInstanceId()).orderByHistoricTaskInstanceStartTime().asc().list();
@@ -1263,7 +1270,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 FlowViewerDto flowViewerDto = new FlowViewerDto();
                 flowViewerDto.setKey(s.getActivityId());
                 flowViewerDto.setCompleted(true);
-                flowViewerList.add(flowViewerDto);
+                if (s.getDeleteReason() == null)
+                    flowViewerList.add(flowViewerDto);
             });
 
             // 获取代办节点
@@ -1277,6 +1285,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 FlowViewerDto flowViewerDto = new FlowViewerDto();
                 flowViewerDto.setKey(s.getActivityId());
                 flowViewerDto.setCompleted(false);
+                for (FlowViewerDto viewerDto : flowViewerList) {
+                    if (viewerDto.getKey().equals(s.getActivityId()))
+                        viewerDto.setCompleted(false);
+                }
                 flowViewerList.add(flowViewerDto);
             });
             Map<String, Object> result = new HashMap();

oa-ui/src/views/flowable/task/finished/detail/index.vue

@@ -168,7 +168,8 @@ export default {
     // 流程任务重获取变量表单
     if (this.taskForm.taskId) {
       this.processVariables(this.taskForm.taskId)
-      this.getAssessByAssessId(this.taskForm.formId)
+      if (this.taskForm.taskName != '')
+        this.getAssessByAssessId(this.taskForm.formId)
     }
     this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);