撤回任务

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

@@ -99,20 +99,24 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         if (Objects.isNull(task)) {
             return AjaxResult.error("任务不存在");
         }
-        //如果pass变量是通过，存入流程任务变量表
-        if (Objects.nonNull(taskVo.getVariables().get("pass")) && taskVo.getVariables().get("pass").equals("通过"))
-            runtimeService.setVariable(task.getExecutionId(), "pass", taskVo.getVariables().get("pass"));
-        else {
-            if (DelegationState.PENDING.equals(task.getDelegationState())) {
-                taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.DELEGATE.getType(), taskVo.getComment());
-                taskService.resolveTask(taskVo.getTaskId(), taskVo.getVariables());
-            } else {
+
+        if (DelegationState.PENDING.equals(task.getDelegationState())) {
+            taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.DELEGATE.getType(), taskVo.getComment());
+            taskService.resolveTask(taskVo.getTaskId(), taskVo.getVariables());
+        } else {
+            //如果pass变量是通过，存入流程任务变量表
+            if (Objects.nonNull(taskVo.getVariables().get("pass")) && taskVo.getVariables().get("pass").equals("通过")) {
+                runtimeService.setVariable(task.getExecutionId(), "pass", taskVo.getVariables().get("pass"));
                 taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.NORMAL.getRemark(), taskVo.getComment());
+            }
+            else {
+                taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.REJECT.getRemark(), taskVo.getComment());
                 Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
                 taskService.setAssignee(taskVo.getTaskId(), userId.toString());
                 taskService.complete(taskVo.getTaskId(), taskVo.getVariables());
             }
         }
+
         return AjaxResult.success();
     }
 
@@ -675,13 +679,17 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             }
         }
 
-        List<UserTask> parentUserTaskList = FlowableUtils.iteratorFindParentUserTasks(source, null, null);
         //仅考虑撤回到其中一个用户任务节点，在没有会签、并行等情况下可以用
-        String targetTaskDefinitionId = parentUserTaskList.get(0).getId();
+        List<HistoricTaskInstance> historicTaskInstanceList = historyService.createHistoricTaskInstanceQuery().processInstanceId(task.getProcessInstanceId()).orderByHistoricTaskInstanceStartTime().asc().list();
+        String lastHistoricTaskDefinitionKey = "";
+        for (HistoricTaskInstance historicTaskInstance : historicTaskInstanceList) {
+            if (historicTaskInstance.getId().equals(flowTaskVo.getTaskId()))
+                lastHistoricTaskDefinitionKey = historicTaskInstance.getTaskDefinitionKey();
+        }
         if (allElements != null) {
             for (FlowElement flowElement : allElements) {
                 // 跳转的节点元素
-                if (flowElement.getId().equals(targetTaskDefinitionId)) {
+                if (flowElement.getId().equals(lastHistoricTaskDefinitionKey)) {
                     target = flowElement;
                 }
             }
@@ -701,7 +709,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             // 1 对 1 或 多 对 1 情况，currentIds 当前要跳转的节点列表(1或多)，targetKey 跳转到的节点(1)
             runtimeService.createChangeActivityStateBuilder()
                     .processInstanceId(task.getProcessInstanceId())
-                    .moveActivityIdsToSingleActivityId(currentIds, targetTaskDefinitionId).changeState();
+                    .moveActivityIdsToSingleActivityId(currentIds, lastHistoricTaskDefinitionKey).changeState();
         } catch (FlowableObjectNotFoundException e) {
             throw new CustomException("未找到流程实例，流程可能已发生变化");
         } catch (FlowableException e) {

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

@@ -191,7 +191,8 @@ export default {
     /** 撤回任务 */
     handleRevoke(row) {
       const params = {
-        instanceId: row.procInsId
+        instanceId: row.procInsId,
+        taskId: row.taskId
       }
       revokeProcess(params).then(res => {
         this.$modal.msgSuccess(res.msg);