修改项目结算退回之后重新提交到退回人

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

@@ -108,6 +108,13 @@ public class FlowTaskController {
         return AjaxResult.success();
     }
 
+    @ApiOperation(value = "重新提交任务")
+    @PostMapping(value = "/reCommit")
+    public AjaxResult taskRecommit(@RequestBody FlowTaskVo flowTaskVo) {
+        flowTaskService.taskRecommit(flowTaskVo);
+        return AjaxResult.success();
+    }
+
     @ApiOperation(value = "获取所有可回退的节点")
     @PostMapping(value = "/returnList")
     public AjaxResult findReturnTaskList(@RequestBody FlowTaskVo flowTaskVo) {
@@ -116,7 +123,7 @@ public class FlowTaskController {
 
     @ApiOperation(value = "获取重新提交的节点")
     @PostMapping(value = "/reCommitTask")
-    public AjaxResult findReCommitTask(FlowTaskVo flowTaskVo) {
+    public AjaxResult findReCommitTask(@RequestBody FlowTaskVo flowTaskVo) {
         return flowTaskService.findReCommitTask(flowTaskVo);
     }
 

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

@@ -36,6 +36,13 @@ public interface IFlowTaskService {
      */
     void taskReturn(FlowTaskVo flowTaskVo);
 
+    /**
+     * 重新提交任务
+     *
+     * @param flowTaskVo 请求实体参数
+     */
+    void taskRecommit(FlowTaskVo flowTaskVo);
+
     /**
      * 获取所有可回退的节点
      *

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

@@ -384,6 +384,96 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     }
 
 
+    /**
+     * 重新提交任务
+     *
+     * @param flowTaskVo 请求实体参数
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void taskRecommit(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<>();
+        currentIds.add(source.getId());
+        // 通过父级网关的出口连线，结合 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.NORMAL.getRemark(), flowTaskVo.getComment()));
+
+        try {
+            // 1 对 1 或 多 对 1 情况，currentIds 当前要跳转的节点列表(1或多)，targetKey 跳转到的节点(1)
+            runtimeService.createChangeActivityStateBuilder()
+                    .processInstanceId(task.getProcessInstanceId())
+                    .moveActivityIdsToSingleActivityId(currentIds, flowTaskVo.getTargetKey()).changeState();
+            String currentTaskId = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getId();
+            List<HistoricTaskInstance> htiList = historyService.createHistoricTaskInstanceQuery()
+                    .processInstanceId(task.getProcessInstanceId()).taskDefinitionKey(flowTaskVo.getTargetKey())
+                    .list();
+            String taskAssignee = "";
+            for (HistoricTaskInstance hti: htiList) {
+                if (!hti.getId().equals(currentTaskId)) {
+                    taskAssignee = hti.getAssignee();
+                    break;
+                }
+            }
+            taskService.setAssignee(currentTaskId, taskAssignee);
+        } catch (FlowableObjectNotFoundException e) {
+            throw new CustomException("未找到流程实例，流程可能已发生变化");
+        } catch (FlowableException e) {
+            throw new CustomException("无法取消或开始活动");
+        }
+    }
+
     /**
      * 获取所有可回退的节点
      *

oa-ui/src/api/flowable/todo.js

@@ -46,6 +46,15 @@ export function returnTask(data) {
   })
 }
 
+// 重新提交任务
+export function taskRecommit(data) {
+  return request({
+    url: '/flowable/task/reCommit',
+    method: 'post',
+    data: data
+  })
+}
+
 // 驳回任务
 export function rejectTask(data) {
   return request({
@@ -140,3 +149,12 @@ export function flowTaskForm(query) {
     params: query
   })
 }
+
+// 重新提交到退回人
+export function findReCommitTask(data){
+  return request({
+    url: '/flowable/task/reCommitTask',
+    method: 'post',
+    data: data
+  })
+}

oa-ui/src/views/flowable/form/components/flowBtn/returnComment.vue

@@ -1,3 +1,9 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-09-27 16:33:10
+ * @LastEditors: 
+ * @LastEditTime: 2024-12-30 09:50:09
+-->
 <template>
   <div>
     <div>退回意见：{{ reBackDescription }}</div>

oa-ui/src/views/flowable/form/settleForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: wrh
- * @LastEditTime: 2024-12-27 11:37:41
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-12-30 10:46:54
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -477,10 +477,8 @@
         <el-button type="success" icon="el-icon-printer" @click="printOpen = true">打印</el-button>
         <div style="text-align: center" v-if="!disabled">
           <el-button type="warning" @click="preserve">保存</el-button>
-          <el-button type="danger"
-            v-if="taskName != '结算发起'"
-            @click="returnOpen = true">退 回</el-button>
-          <el-button type="primary" @click="submitNextFlow" v-if="taskName != '董事长批准'">提交下一个流程</el-button>
+          <el-button type="danger" v-if="taskName != '结算发起'" @click="returnOpen = true">退 回</el-button>
+          <el-button type="primary" @click="submitNextFlow" v-if="taskName != '董事长批准'">提 交</el-button>
           <el-button type="primary" @click="submitNextFlow" v-else>结算批准</el-button>
         </div>
       </el-col>
@@ -527,7 +525,7 @@ import ChoosePrice from "./components/choosePrice.vue";
 import { getUser } from "@/api/system/user";
 import { getUserByRole } from "@/api/system/role";
 import { getUserByPost } from "@/api/system/post";
-import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import { complete, getNextFlowNode, returnTask, findReCommitTask, taskRecommit } from "@/api/flowable/todo";
 import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept, } from "@/api/system/post.js";
 import { listBudget } from "@/api/oa/budget/budget";
 import { listBudgetSettle } from "@/api/oa/budget/budgetSettle";
@@ -851,9 +849,22 @@ export default {
               confirmButtonText: '确定',
               type: 'warning'
             }).then(() => {
-              getUserByRole({ roleId: 4 }).then((res) => {
-                this.getNextFlowNodeFn(res.data[0]);
-              });
+              if (this.showAlter) {
+                const taskId = this.taskForm.taskId
+                findReCommitTask(this.taskForm).then(res => {
+                  taskRecommit({ taskId, targetKey: res.data[0].id, comment: '' }).then(res1 => {
+                    if (res1.code == 200) {
+                      this.$message.success('操作成功')
+                      this.$emit('goBack');
+                    }
+                  })
+                })
+              } else {
+                getUserByRole({ roleId: 4 }).then((res) => {
+                  this.getNextFlowNodeFn(res.data[0]);
+                });
+              }
+
             })
           } else if (this.taskName == "综合事务部处理") {
             getUserByRole({ roleId: 5 }).then((res) => {