update 2.9.29

xlorne · xlorne · commit 9ede2520482f · 2025-02-10T09:39:21.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.9.28</version>
+    <version>2.9.29</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-authorization/pom.xml b/springboot-starter-data-authorization/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.28</version>
+        <version>2.9.29</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.28</version>
+        <version>2.9.29</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.28</version>
+        <version>2.9.29</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/content/FlowSession.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/content/FlowSession.java
@@ -24,15 +24,15 @@
 @Getter
 public class FlowSession {
 
-    // 当前的流程记录
+    // 当前的流程记录（当前审批的流程）
     private final FlowRecord flowRecord;
     // 当前的流程设计器
     private final FlowWork flowWork;
     // 当前的流程节点
     private final FlowNode flowNode;
     // 流程的创建者
     private final IFlowOperator createOperator;
-    // 当前的操作者
+    // 当前的操作者（当前的操作者，非代办人）
     private final IFlowOperator currentOperator;
     // 流程绑定数据
     private final IBindData bindData;
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/record/FlowRecord.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/record/FlowRecord.java
@@ -344,6 +344,14 @@ public boolean isTransfer() {
         return this.flowType == FlowType.TRANSFER;
     }
 
+
+    /**
+     * 拒绝状态
+     */
+    public boolean isReject() {
+        return this.opinion != null && this.opinion.isReject() && isDone();
+    }
+
     /**
      * 审批通过
      */
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowNodeService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowNodeService.java
@@ -101,24 +101,44 @@ public void skipCirculate() {
     /**
      * 加载默认回退节点
      */
-    public void loadDefaultBackNode(long parentRecordId) {
-        IFlowOperator flowOperator;
-        // 拒绝时，默认返回上一个已办节点
-        FlowRecord preRecord = flowRecordRepository.getFlowRecordById(parentRecordId);
-        // 只寻找已办节点
-        while (!preRecord.isDone()) {
-            // 继续寻找上一个节点
-            preRecord = flowRecordRepository.getFlowRecordById(preRecord.getPreId());
-        }
-        // 获取上一个节点的审批者，继续将审批者设置为当前审批者
-        flowOperator = preRecord.getCurrentOperator();
-        FlowNode nextNode = flowWork.getNodeByCode(preRecord.getNodeCode());
-        if (nextNode == null) {
-            throw new IllegalArgumentException("next node not found");
+    public void loadDefaultBackNode(FlowRecord currentRecord) {
+        List<FlowRecord> historyRecords =
+                flowRecordRepository.findFlowRecordByProcessId(currentRecord.getProcessId())
+                        .stream()
+                        .sorted((o1, o2) -> (int) (o2.getId() - o1.getId()))
+                        .filter(record -> record.getId() < currentRecord.getId())
+                        .collect(Collectors.toList());
+
+        int index = 0;
+        while (true) {
+            if (index >= historyRecords.size()) {
+                throw new IllegalArgumentException("back node not found");
+            }
+            FlowRecord record = historyRecords.get(index);
+            if (record.isDone()) {
+                // 是连续的回退节点时，则根据流程记录的状态来判断
+                if(record.isReject()){
+                    boolean startRemove = false;
+                    for(FlowRecord historyRecord: historyRecords){
+                        if(startRemove){
+                            this.nextNode = flowWork.getNodeByCode(historyRecord.getNodeCode());
+                            this.nextOperator = historyRecord.getCurrentOperator();
+                            this.backOperator = historyRecord.getCurrentOperator();
+                            return;
+                        }
+                        if(historyRecord.getNodeCode().equals(currentRecord.getNodeCode())){
+                            startRemove = true;
+                        }
+                    }
+                }else {
+                    this.nextNode = flowWork.getNodeByCode(record.getNodeCode());
+                    this.nextOperator = record.getCurrentOperator();
+                    this.backOperator = record.getCurrentOperator();
+                    return;
+                }
+            }
+            index++;
         }
-        this.nextNode = nextNode;
-        this.nextOperator = flowOperator;
-        this.backOperator = flowOperator;
     }
 
 
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSubmitService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSubmitService.java
@@ -194,7 +194,7 @@ private void loadNextNode(List<FlowRecord> historyRecords) {
             flowNodeService.loadNextPassNode(flowNode);
             // 审批拒绝返回上一节点
         } else if (flowDirectionService.isDefaultBackRecord()) {
-            flowNodeService.loadDefaultBackNode(flowRecord.getPreId());
+            flowNodeService.loadDefaultBackNode(flowRecord);
         } else {
             // 审批拒绝，并且自定了返回节点
             flowNodeService.loadCustomBackNode(flowNode, flowRecord.getPreId());
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowTest2.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowTest2.java
@@ -7,6 +7,7 @@
 import com.codingapi.springboot.flow.em.ApprovalType;
 import com.codingapi.springboot.flow.flow.Leave;
 import com.codingapi.springboot.flow.matcher.OperatorMatcher;
+import com.codingapi.springboot.flow.pojo.FlowDetail;
 import com.codingapi.springboot.flow.record.FlowRecord;
 import com.codingapi.springboot.flow.repository.*;
 import com.codingapi.springboot.flow.service.FlowService;
@@ -175,4 +176,116 @@ void flowWaitingTest() {
         assertTrue(records.stream().allMatch(FlowRecord::isFinish));
 
     }
+
+
+    /**
+     * 部门拒绝再提交测试
+     */
+    @Test
+    void rejectTest() {
+        PageRequest pageRequest = PageRequest.of(0, 1000);
+
+        User user = new User("张飞");
+        userRepository.save(user);
+
+        User dept = new User("刘备");
+        userRepository.save(dept);
+
+        User boss = new User("诸葛亮");
+        userRepository.save(boss);
+
+        FlowWork flowWork = FlowWorkBuilder.builder(user)
+                .title("请假流程")
+                .nodes()
+                .node("开始节点", "start", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
+                .node("部门领导审批", "dept", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(dept.getUserId()))
+                .node("总经理审批", "manager", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(boss.getUserId()))
+                .node("结束节点", "over", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
+                .relations()
+                .relation("部门领导审批", "start", "dept")
+                .relation("总经理审批", "dept", "manager")
+                .relation("结束节点", "manager", "over")
+                .build();
+
+        flowWorkRepository.save(flowWork);
+
+        String workCode = flowWork.getCode();
+
+        Leave leave = new Leave("我要出去看看");
+        leaveRepository.save(leave);
+
+        // 创建流程
+        flowService.startFlow(workCode, user, leave, "发起流程");
+
+        // 查看我的待办
+        List<FlowRecord> userTodos = flowRecordRepository.findTodoByOperatorId(user.getUserId(), pageRequest).getContent();
+        assertEquals(1, userTodos.size());
+
+        // 提交流程
+        FlowRecord userTodo = userTodos.get(0);
+
+        // 查看流程详情
+        FlowDetail flowDetail = flowService.detail(userTodo.getId());
+        assertEquals("我要出去看看", ((Leave) flowDetail.getBindData()).getTitle());
+        assertTrue(flowDetail.getFlowRecord().isUnRead());
+
+
+        flowService.submitFlow(userTodo.getId(), user, leave, Opinion.pass("同意"));
+
+        // 查看部门经理的待办
+        List<FlowRecord> deptTodos = flowRecordRepository.findTodoByOperatorId(dept.getUserId(), pageRequest).getContent();
+        assertEquals(1, deptTodos.size());
+
+        // 提交部门经理的审批
+        FlowRecord deptTodo = deptTodos.get(0);
+        flowService.submitFlow(deptTodo.getId(), dept, leave, Opinion.pass("同意"));
+
+        // 查看老板审批
+        List<FlowRecord> bossTodos = flowRecordRepository.findTodoByOperatorId(boss.getUserId(), pageRequest).getContent();
+        assertEquals(1, bossTodos.size());
+
+        // 老板审批不通过
+        FlowRecord bossTodo = bossTodos.get(0);
+        flowService.submitFlow(bossTodo.getId(), boss, leave, Opinion.reject("不同意"));
+
+        // 部门经理查看到流程
+        deptTodos = flowRecordRepository.findTodoByOperatorId(dept.getUserId(), pageRequest).getContent();
+        assertEquals(1, deptTodos.size());
+
+        // 提交部门经理的审批
+        deptTodo = deptTodos.get(0);
+        flowService.submitFlow(deptTodo.getId(), dept, leave, Opinion.reject("不同意"));
+
+        // 查看用户的待办
+        userTodos = flowRecordRepository.findTodoByOperatorId(user.getUserId(), pageRequest).getContent();
+        assertEquals(1, userTodos.size());
+
+        // 用户再次提交
+        userTodo = userTodos.get(0);
+        flowService.submitFlow(userTodo.getId(), user, leave, Opinion.pass("同意"));
+
+        // 部门经理查看到流程
+        deptTodos = flowRecordRepository.findTodoByOperatorId(dept.getUserId(), pageRequest).getContent();
+        assertEquals(1, deptTodos.size());
+
+        // 提交部门经理的审批
+        deptTodo = deptTodos.get(0);
+        flowService.submitFlow(deptTodo.getId(), dept, leave, Opinion.pass("同意"));
+
+        // 查看老板审批
+        bossTodos = flowRecordRepository.findTodoByOperatorId(boss.getUserId(), pageRequest).getContent();
+        assertEquals(1, bossTodos.size());
+
+        // 老板审批通过
+        bossTodo = bossTodos.get(0);
+        flowService.submitFlow(bossTodo.getId(), boss, leave, Opinion.pass("同意"));
+
+
+        List<FlowRecord> records = flowRecordRepository.findAll(pageRequest).getContent();
+        assertEquals(7, records.size());
+
+        // 查看所有流程是否都已经结束
+        assertTrue(records.stream().allMatch(FlowRecord::isFinish));
+
+    }
 }
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.28</version>
+        <version>2.9.29</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.9.28</version>
+        <version>2.9.29</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 
diff --git a/springboot-starter/src/main/resources/META-INF/banner.txt b/springboot-starter/src/main/resources/META-INF/banner.txt
@@ -1,4 +1,4 @@
 ------------------------------------------------------
-CodingApi SpringBoot-Starter 2.9.28
+CodingApi SpringBoot-Starter 2.9.29
 springboot version (${spring-boot.version})
 ------------------------------------------------------
