重新提交到上一办理节点

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowTaskController.java

@@ -114,6 +114,12 @@ public class FlowTaskController {
         return flowTaskService.findReturnTaskList(flowTaskVo);
     }
 
+    @ApiOperation(value = "获取重新提交的节点")
+    @PostMapping(value = "/reCommitTask")
+    public AjaxResult findReCommitTask(FlowTaskVo flowTaskVo) {
+        return flowTaskService.findReCommitTask(flowTaskVo);
+    }
+
     @ApiOperation(value = "删除任务")
     @DeleteMapping(value = "/delete")
     public AjaxResult delete(@RequestBody FlowTaskVo flowTaskVo) {

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

@@ -44,6 +44,14 @@ public interface IFlowTaskService {
      */
     AjaxResult findReturnTaskList(FlowTaskVo flowTaskVo);
 
+    /**
+     * 获取重新提交的节点
+     *
+     * @param flowTaskVo
+     * @return
+     */
+    AjaxResult findReCommitTask(FlowTaskVo flowTaskVo);
+
     /**
      * 删除任务
      *

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

@@ -475,6 +475,50 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         return AjaxResult.success(userTaskList);
     }
 
+    /**
+     * 获取重新提交的节点
+     *
+     * @param flowTaskVo
+     * @return
+     */
+    @Override
+    public AjaxResult findReCommitTask(FlowTaskVo flowTaskVo) {
+        // 当前任务 task
+        Task task = taskService.createTaskQuery().taskId(flowTaskVo.getTaskId()).singleResult();
+        // 从流程历史任务中获取可重新提交的节点
+        List<HistoricActivityInstance> hisActIns = historyService.createHistoricActivityInstanceQuery()
+                .processInstanceId(task.getProcessInstanceId())
+                .activityType("userTask")
+                .orderByHistoricActivityInstanceStartTime()
+                .desc()
+                .list();
+
+        // 跳转的节点列表
+        List<HistoricActivityInstance> reCommitList = new ArrayList<>();
+        if (hisActIns.size() > 0)
+        reCommitList.add(hisActIns.get(1));
+
+
+        List<UserTask> userTaskList = new ArrayList<>();
+        // 获取流程定义信息
+        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(task.getProcessDefinitionId()).singleResult();
+        // 获取所有节点信息，暂不考虑子流程情况
+        Process process = repositoryService.getBpmnModel(processDefinition.getId()).getProcesses().get(0);
+        Collection<FlowElement> flowElements = process.getFlowElements();
+        // 获取当前任务节点元素
+        UserTask source = null;
+        if (flowElements != null) {
+            for (FlowElement flowElement : flowElements) {
+                // 类型为用户节点
+                if (reCommitList.size() > 0 && flowElement.getId().equals(reCommitList.get(0).getActivityId())) {
+                    source = (UserTask) flowElement;
+                }
+            }
+        }
+        userTaskList.add(source);
+        return AjaxResult.success(userTaskList);
+    }
+
     /**
      * 删除任务
      *