update Notify Node record

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/ProcessNode.java

@@ -245,13 +245,19 @@ public static class FlowOperatorBody {
          */
         private long approveTime;
 
+        /**
+         * 读取时间
+         */
+        private long readTime;
+
         public FlowOperatorBody(FlowRecord flowRecord, IFlowOperator flowOperator) {
             this.advice = flowRecord.getAdvice();
             this.signKey = flowRecord.getSignKey();
             this.approveTime = flowRecord.getUpdateTime();
             this.actionName = flowRecord.getActionName();
             this.actionType = flowRecord.getActionType();
             this.flowOperator = flowOperator;
+            this.readTime = flowRecord.getReadTime();
         }
 
         public FlowOperatorBody(IFlowOperator flowOperator) {

flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowRecord.java

@@ -477,6 +477,15 @@ public void update(FlowSession flowSession, boolean pass) {
         }
     }
 
+    public void clearNotify(){
+        this.readable = false;
+        this.readTime = 0;
+        this.advice = null;
+        this.signKey = null;
+        this.notify = true;
+        this.forwardOperatorId = 0;
+    }
+
 
     /**
      * 清空已办
@@ -510,8 +519,7 @@ public void notifyRecord(FlowSession flowSession) {
         this.setTimeoutTime(nodeStrategyManager.getTimeoutTime());
         this.setMergeable(nodeStrategyManager.isEnableMergeable());
         this.update(flowSession, true);
-        this.notify = true;
-        this.forwardOperatorId = 0;
+        this.clearNotify();
     }
 
 

flow-engine-framework/src/test/java/com/codingapi/flow/service/FlowDetailServiceTest.java

@@ -13,6 +13,7 @@
 import com.codingapi.flow.form.permission.PermissionType;
 import com.codingapi.flow.node.nodes.ApprovalNode;
 import com.codingapi.flow.node.nodes.EndNode;
+import com.codingapi.flow.node.nodes.NotifyNode;
 import com.codingapi.flow.node.nodes.StartNode;
 import com.codingapi.flow.pojo.body.FlowAdviceBody;
 import com.codingapi.flow.pojo.request.FlowActionRequest;
@@ -210,6 +211,15 @@ void processNodes() {
                 )
                 .build();
 
+
+        NotifyNode notifyNode = NotifyNode.builder()
+                .name("经理审批")
+                .strategies(NodeStrategyBuilder.builder()
+                        .addStrategy(new OperatorLoadStrategy("def run(request){return [2]}"))
+                        .build()
+                )
+                .build();
+
         EndNode endNode = EndNode.builder().build();
         Workflow workflow = WorkflowBuilder.builder()
                 .title("请假流程")
@@ -218,6 +228,7 @@ void processNodes() {
                 .form(form)
                 .addNode(startNode)
                 .addNode(bossNode)
+                .addNode(notifyNode)
                 .addNode(endNode)
                 .build();
 
@@ -226,7 +237,7 @@ void processNodes() {
         Map<String, Object> data = Map.of("name", "lorne", "days", 1, "reason", "leave");
 
         List<ProcessNode> nodeList = factory.flowService.processNodes(new FlowProcessNodeRequest(workflow.getId(), user.getUserId(),data));
-        assertEquals(3,nodeList.size());
+        assertEquals(4,nodeList.size());
         assertEquals(0,nodeList.stream().filter(ProcessNode::isHistory).toList().size());
 
         List<IFlowAction> startActions = startNode.actionManager().getActions();
@@ -241,7 +252,7 @@ void processNodes() {
         assertEquals(1, userRecordList.size());
 
         nodeList = factory.flowService.processNodes(new FlowProcessNodeRequest(userRecordList.get(0).getId(), user.getUserId(),data));
-        assertEquals(3,nodeList.size());
+        assertEquals(4,nodeList.size());
         assertEquals(0,nodeList.stream().filter(ProcessNode::isHistory).toList().size());
 
 
@@ -256,7 +267,7 @@ void processNodes() {
 
 
         nodeList = factory.flowService.processNodes(new FlowProcessNodeRequest(bossRecordList.get(0).getId(), boss.getUserId(),data));
-        assertEquals(3,nodeList.size());
+        assertEquals(4,nodeList.size());
         assertEquals(1,nodeList.stream().filter(ProcessNode::isHistory).toList().size());
 
         List<IFlowAction> bossActions = bossNode.actionManager().getActions();
@@ -268,8 +279,12 @@ void processNodes() {
         factory.flowService.action(bossRequest);
 
         List<FlowRecord> records = factory.flowRecordRepository.findProcessRecords(bossRecordList.get(0).getProcessId());
-        assertEquals(2, records.size());
-        assertEquals(2, records.stream().filter(FlowRecord::isFinish).toList().size());
+        assertEquals(3, records.size());
+        assertEquals(3, records.stream().filter(FlowRecord::isFinish).toList().size());
+
+
+        nodeList = factory.flowService.processNodes(new FlowProcessNodeRequest(bossRecordList.get(0).getId(), boss.getUserId(),data));
+        assertEquals(4,nodeList.size());
 
     }
 }