finish over node

xlorne · xlorne · commit 8bfad9849d58 · 2024-11-21T21:03:14.000+08:00
diff --git a/admin-ui/src/pages/flow/work/index.tsx b/admin-ui/src/pages/flow/work/index.tsx
@@ -276,7 +276,6 @@ const FlowPage = () => {
                             onClick={async () => {
                                 const data = flowActionType.current?.getData();
                                 const json = JSON.stringify(data);
-                                console.log(json);
                                 await handlerSchema(json);
                             }}
                         >
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/FlowNode.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/FlowNode.java
@@ -305,9 +305,9 @@ public boolean isStartNode() {
     }
 
     /**
-     * 是否抄送节点
+     * 是否传阅节点
      */
-    public boolean isCC() {
-        return approvalType == ApprovalType.CC;
+    public boolean isCirculate() {
+        return approvalType == ApprovalType.CIRCULATE;
     }
 }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/Opinion.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/Opinion.java
@@ -28,6 +28,8 @@ public class Opinion {
     public static final int RESULT_PASS = 2;
     // 审批结果 驳回
     public static final int RESULT_REJECT = 3;
+    // 审批结果 抄送
+    public static final int RESULT_CIRCULATE = 4;
 
     /**
      * 审批意见
@@ -68,6 +70,14 @@ public static Opinion unSignAutoSuccess() {
         return new Opinion("非会签自动审批", RESULT_PASS, TYPE_AUTO);
     }
 
+    public static Opinion circulate() {
+        return new Opinion("抄送", RESULT_CIRCULATE, TYPE_AUTO);
+    }
+
+    public boolean isCirculate() {
+        return result == RESULT_CIRCULATE;
+    }
+
     public boolean isSuccess() {
         return result == RESULT_PASS;
     }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/em/ApprovalType.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/em/ApprovalType.java
@@ -14,9 +14,9 @@ public enum ApprovalType {
      */
     UN_SIGN,
     /**
-     * 抄送
+     * 传阅
      */
-    CC;
+    CIRCULATE;
 
 
     public static ApprovalType parser(String approvalType) {
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/em/FlowType.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/em/FlowType.java
@@ -14,9 +14,9 @@ public enum FlowType {
      */
     DONE,
     /**
-     * 抄送
+     * 传阅
      */
-    CC,
+    CIRCULATE,
     /**
      * 转办
      */
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/em/NodeType.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/em/NodeType.java
@@ -14,9 +14,9 @@ public enum NodeType {
      */
     APPROVAL,
     /**
-     * 抄送
+     * 传阅
      */
-    CC,
+    CIRCULATE,
     /**
      * 结束
      */
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/event/FlowApprovalEvent.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/event/FlowApprovalEvent.java
@@ -33,7 +33,7 @@ public class FlowApprovalEvent implements ISyncEvent {
     // 催办
     public static final int STATE_URGE = 8;
     // 抄送
-    public static final int STATE_CC = 9;
+    public static final int STATE_CIRCULATE = 9;
 
 
     private final int state;
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
@@ -230,6 +230,17 @@ public void submitRecord(IFlowOperator flowOperator, BindDataSnapshot snapshot,
         this.opinion = opinion;
     }
 
+
+    /**
+     * 传阅流程
+     */
+    public void circulate() {
+        this.flowSourceDirection = FlowSourceDirection.PASS;
+        this.flowType = FlowType.CIRCULATE;
+        this.updateTime = System.currentTimeMillis();
+        this.opinion = Opinion.circulate();
+    }
+
     /**
      * 转交流程
      */
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/repository/FlowRecordRepository.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/repository/FlowRecordRepository.java
@@ -67,4 +67,5 @@ public interface FlowRecordRepository {
      * @param childrenRecords 流程记录
      */
     void delete(List<FlowRecord> childrenRecords);
+
 }
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
@@ -63,17 +63,34 @@ public FlowNodeService(FlowOperatorRepository flowOperatorRepository,
     }
 
 
+    /**
+     * 设置下一个节点
+     */
     public void setNextNode(FlowNode nextNode) {
         this.nextNode = nextNode;
         this.nextOperator = currentOperator;
     }
 
 
+    /**
+     * 加载下一个节点
+     */
     public void loadNextPassNode(FlowNode currentNode){
         this.nextNode = matcherNextNode(currentNode, false);
         this.nextOperator = currentOperator;
     }
 
+    /**
+     * 跳过传阅节点流转
+     */
+    public void skipCirculate() {
+        this.nextNode = matcherNextNode(nextNode, false);
+        this.nextOperator = currentOperator;
+    }
+
+    /**
+     * 加载默认回退节点
+     */
     public void loadDefaultBackNode(long parentRecordId){
         IFlowOperator flowOperator;
         // 拒绝时，默认返回上一个已办节点
@@ -94,6 +111,9 @@ public void loadDefaultBackNode(long parentRecordId){
     }
 
 
+    /**
+     * 加载自定义回退节点
+     */
     public void loadCustomBackNode(FlowNode flowNode, long parentRecordId){
         FlowNode nextNode = this.matcherNextNode(flowNode, true);
         if (nextNode == null) {
@@ -232,8 +252,8 @@ private List<FlowRecord> errMatcher(FlowNode currentNode, IFlowOperator currentO
     /**
      * 下一节点的类型
      */
-    public boolean nextNodeIsCC() {
-        return nextNode.isCC();
+    public boolean nextNodeIsCirculate() {
+        return nextNode.isCirculate();
     }
 
 
@@ -243,4 +263,6 @@ public boolean nextNodeIsCC() {
     public boolean nextNodeIsOver(){
         return nextNode.isOverNode();
     }
+
+
 }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowService.java
@@ -424,18 +424,6 @@ public FlowResult submitFlow(long recordId, IFlowOperator currentOperator, IBind
         // 根据所有提交意见，重新加载审批方向
         flowSourceDirection = flowDirectionService.reloadFlowSourceDirection();
 
-
-        // 判断流程是否完成
-        if (flowDirectionService.hasCurrentFlowIsFinish()) {
-            flowRecord.finish();
-            flowRecord.submitRecord(currentOperator, snapshot, opinion, flowSourceDirection);
-            flowRecordRepository.update(flowRecord);
-            flowRecordRepository.finishFlowRecordByProcessId(flowRecord.getProcessId());
-
-            EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_FINISH, flowRecord, currentOperator, flowWork, snapshot.toBindData()), true);
-            return new FlowResult(flowWork, flowRecord);
-        }
-
         // 获取流程的发起者
         IFlowOperator createOperator = flowRecord.getCreateOperator();
 
@@ -453,7 +441,6 @@ public FlowResult submitFlow(long recordId, IFlowOperator currentOperator, IBind
                 flowRecord.getId()
         );
 
-
         // 审批通过并进入下一节点
         if (flowDirectionService.isPassRecord()) {
             flowNodeService.loadNextPassNode(flowNode);
@@ -465,37 +452,69 @@ public FlowResult submitFlow(long recordId, IFlowOperator currentOperator, IBind
             // 审批拒绝，并且自定了返回节点
         }
 
-
         // 创建下一节点的流程记录
         List<FlowRecord> records = flowNodeService.createRecord();
 
-//        if(flowNodeService.nextNodeIsOver() && records.size()==1){
-//            FlowRecord record = records.get(0);
-//            record.finish();
-//            record.submitRecord(currentOperator, snapshot, opinion, flowSourceDirection);
-//            flowRecordRepository.update(record);
-//            flowRecordRepository.finishFlowRecordByProcessId(record.getProcessId());
-//
-//            EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_FINISH, record, currentOperator, flowWork, snapshot.toBindData()), true);
-//            return new FlowResult(flowWork, record);
-//        }
+        // 检测流程是否为抄送节点
+        while (flowNodeService.nextNodeIsCirculate()){
+            for (FlowRecord record : records) {
+                record.circulate();
+            }
+            flowRecordRepository.save(records);
 
-        // 保存流程记录
-        flowRecordRepository.save(records);
+            for (FlowRecord record : records) {
+                IFlowOperator pushOperator = record.getCurrentOperator();
+
+                EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_CIRCULATE,
+                        record,
+                        pushOperator,
+                        flowWork,
+                        snapshot.toBindData()),
+                        true);
+            }
 
-        // 检测流程是否为抄送节点
+            flowNodeService.skipCirculate();
 
-        // 检测流程是否为结束节点
+            records = flowNodeService.createRecord();
+        }
 
+        // 判断流程是否完成
+        if(flowNodeService.nextNodeIsOver()){
+            flowRecord.finish();
+            flowRecord.submitRecord(currentOperator, snapshot, opinion, flowSourceDirection);
+            flowRecordRepository.update(flowRecord);
+            flowRecordRepository.finishFlowRecordByProcessId(flowRecord.getProcessId());
+
+            EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_FINISH,
+                    flowRecord,
+                    currentOperator,
+                    flowWork,
+                    snapshot.toBindData()),
+                    true);
+            return new FlowResult(flowWork, flowRecord);
+        }
+
+        // 保存流程记录
+        flowRecordRepository.save(records);
 
         // 推送审批事件消息
         int eventState = flowSourceDirection == FlowSourceDirection.PASS ? FlowApprovalEvent.STATE_PASS : FlowApprovalEvent.STATE_REJECT;
-        EventPusher.push(new FlowApprovalEvent(eventState, flowRecord, currentOperator, flowWork, snapshot.toBindData()), true);
+        EventPusher.push(new FlowApprovalEvent(eventState,
+                flowRecord,
+                currentOperator,
+                flowWork,
+                snapshot.toBindData()),
+                true);
 
         // 推送待办事件消息
         for (FlowRecord record : records) {
             IFlowOperator pushOperator = record.getCurrentOperator();
-            EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_TODO, record, pushOperator, flowWork, snapshot.toBindData()), true);
+            EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_TODO,
+                    record,
+                    pushOperator,
+                    flowWork,
+                    snapshot.toBindData()),
+                    true);
         }
 
         return new FlowResult(flowWork, records);
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/BuildTest.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/BuildTest.java
@@ -27,14 +27,14 @@ void build() {
                 .node("开始节点", "start", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
                 .node("部门领导审批", "dept", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
                 .node("总经理审批", "manager", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
-                .node("抄送节点", "cc", "default", ApprovalType.CC, OperatorMatcher.anyOperatorMatcher())
+                .node("抄送节点", "circulate", "default", ApprovalType.CIRCULATE, OperatorMatcher.anyOperatorMatcher())
                 .node("结束节点", "over", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
 
                 .relations()
                 .relation("部门领导审批", "start", "dept")
                 .relation("总经理审批", "dept", "manager")
-                .relation("抄送节点", "manager", "cc")
-                .relation("结束节点", "cc", "over")
+                .relation("抄送节点", "manager", "circulate")
+                .relation("结束节点", "circulate", "over")
                 .build();
         assertEquals("请假流程", flowWork.getTitle());
         assertEquals(5, flowWork.getNodes().size());
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/ErrorTest.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/ErrorTest.java
@@ -55,7 +55,7 @@ void errorMatcherOperatorTest(){
                 .node("开始节点", "start", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
                 .node("部门领导审批", "dept", "default", ApprovalType.UN_SIGN, new OperatorMatcher("def run(content){return []}"), new ErrTrigger("def run(content){return content.createOperatorErrTrigger("+dept.getId()+")}"), true)
                 .node("总经理审批", "manager", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(boss.getUserId()))
-                .node("结束节点", "over", "default", ApprovalType.UN_SIGN, OperatorMatcher.creatorOperatorMatcher())
+                .node("结束节点", "over", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
                 .relations()
                 .relation("部门领导审批", "start", "dept")
                 .relation("总经理审批", "dept", "manager")
@@ -108,21 +108,18 @@ void errorMatcherOperatorTest(){
 
         // 查看所有流程
         List<FlowRecord> records = flowRecordRepository.findAll(pageRequest).getContent();
-        assertEquals(4, records.size());
+        assertEquals(3, records.size());
 
         userTodos = flowRecordRepository.findTodoByOperatorId(user.getUserId(), pageRequest).getContent();
-        assertEquals(1, userTodos.size());
-
-        userTodo = userTodos.get(0);
-        flowService.submitFlow(userTodo.getId(), user, leave, Opinion.pass("同意"));
+        assertEquals(0, userTodos.size());
 
         records = flowRecordRepository.findAll(pageRequest).getContent();
-        assertEquals(4, records.size());
+        assertEquals(3, records.size());
         // 查看所有流程是否都已经结束
         assertTrue(records.stream().allMatch(FlowRecord::isFinish));
 
         List<BindDataSnapshot> snapshots = flowBindDataRepository.findAll();
-        assertEquals(5, snapshots.size());
+        assertEquals(4, snapshots.size());
     }
 
 
@@ -150,7 +147,7 @@ void errorMatcherNodeTest(){
                 .node("开始节点", "start", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
                 .node("部门领导审批", "dept", "default", ApprovalType.UN_SIGN, new OperatorMatcher("def run(content){return []}"), new ErrTrigger("def run(content){return content.createNodeErrTrigger('manager')}"), true)
                 .node("总经理审批", "manager", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(boss.getUserId()))
-                .node("结束节点", "over", "default", ApprovalType.UN_SIGN, OperatorMatcher.creatorOperatorMatcher())
+                .node("结束节点", "over", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
                 .relations()
                 .relation("部门领导审批", "start", "dept")
                 .relation("总经理审批", "dept", "manager")
@@ -199,20 +196,17 @@ void errorMatcherNodeTest(){
 
         // 查看所有流程
         List<FlowRecord> records = flowRecordRepository.findAll(pageRequest).getContent();
-        assertEquals(3, records.size());
+        assertEquals(2, records.size());
 
         userTodos = flowRecordRepository.findTodoByOperatorId(user.getUserId(), pageRequest).getContent();
-        assertEquals(1, userTodos.size());
-
-        userTodo = userTodos.get(0);
-        flowService.submitFlow(userTodo.getId(), user, leave, Opinion.pass("同意"));
+        assertEquals(0, userTodos.size());
 
         records = flowRecordRepository.findAll(pageRequest).getContent();
-        assertEquals(3, records.size());
+        assertEquals(2, records.size());
         // 查看所有流程是否都已经结束
         assertTrue(records.stream().allMatch(FlowRecord::isFinish));
 
         List<BindDataSnapshot> snapshots = flowBindDataRepository.findAll();
-        assertEquals(4, snapshots.size());
+        assertEquals(3, snapshots.size());
     }
 }
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowTest.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowTest.java
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
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/MultiRelationFlowTest.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/MultiRelationFlowTest.java
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/QueryTest.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/QueryTest.java
diff --git a/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/SignTest.java b/springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/SignTest.java

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,6 @@ const FlowPage = () => {`
`276`	`276`	`onClick={async () => {`
`277`	`277`	`const data = flowActionType.current?.getData();`
`278`	`278`	`const json = JSON.stringify(data);`
`279`		`- console.log(json);`
`280`	`279`	`await handlerSchema(json);`
`281`	`280`	`}}`
`282`	`281`	`>`
Original file line number	Diff line number	Diff line change
`@@ -305,9 +305,9 @@ public boolean isStartNode() {`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`/**`
`308`		`- * 是否抄送节点`
	`308`	`+ * 是否传阅节点`
`309`	`309`	`*/`
`310`		`- public boolean isCC() {`
`311`		`- return approvalType == ApprovalType.CC;`
	`310`	`+ public boolean isCirculate() {`
	`311`	`+ return approvalType == ApprovalType.CIRCULATE;`
`312`	`312`	`}`
`313`	`313`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,4 +67,5 @@ public interface FlowRecordRepository {`
`67`	`67`	`* @param childrenRecords 流程记录`
`68`	`68`	`*/`
`69`	`69`	`void delete(List<FlowRecord> childrenRecords);`
	`70`	`+`
`70`	`71`	`}`