add startFlow opinion

xlorne · xlorne · commit 1befcc17b88d · 2024-10-28T14:55:53.000+08:00
diff --git a/example/example-application/pom.xml b/example/example-application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.1</version>
+        <version>3.3.2.dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.1</version>
+        <version>3.3.2.dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-flow/pom.xml b/example/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.1</version>
+        <version>3.3.2.dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-jpa/pom.xml b/example/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.1</version>
+        <version>3.3.2.dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.1</version>
+        <version>3.3.2.dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -13,11 +13,11 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.2.dev</version>
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.1</version>
+    <version>3.3.2.dev</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.1</version>
+    <version>3.3.2.dev</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
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>3.3.1</version>
+        <version>3.3.2.dev</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>3.3.1</version>
+        <version>3.3.2.dev</version>
     </parent>
 
     <name>springboot-starter-flow</name>
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
@@ -177,10 +177,9 @@ public boolean isUnRead() {
 
 
     /**
-     * 更新时间
+     * 更新opinion
      */
-    public void update(Opinion opinion) {
-        this.read();
+    public void updateOpinion(Opinion opinion) {
         this.opinion = opinion;
         this.updateTime = System.currentTimeMillis();
     }
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowRecordBuilderService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowRecordBuilderService.java
@@ -152,24 +152,44 @@ private List<FlowRecord> errMatcher(FlowNode currentNode, IFlowOperator currentO
      * @return 流程记录
      */
     public List<FlowRecord> createRecord(FlowNode currentNode, IFlowOperator currentOperator) {
+       return this.createRecord(currentNode,currentOperator,null);
+    }
+
+    /**
+     * 创建流程记录
+     *
+     * @param currentNode       当前节点
+     * @param currentOperator   当前审批人
+     * @param opinion           审批意见
+     * @return 流程记录
+     */
+    public List<FlowRecord> createRecord(FlowNode currentNode, IFlowOperator currentOperator,Opinion opinion) {
         FlowSession flowSession = new FlowSession(flowWork, currentNode, createOperator, currentOperator, snapshot.toBindData(), opinion, historyRecords);
         long workId = flowWork.getId();
         List<? extends IFlowOperator> operators = currentNode.loadFlowNodeOperator(flowSession, flowOperatorRepository);
+        List<FlowRecord> recordList;
         if (operators.isEmpty()) {
-            List<FlowRecord> errorRecordList = this.errMatcher(currentNode, currentOperator);
-            if (errorRecordList.isEmpty()) {
+            recordList= this.errMatcher(currentNode, currentOperator);
+            if (recordList.isEmpty()) {
                 throw new IllegalArgumentException("operator not match.");
             }
-            return errorRecordList;
         } else {
             String recordTitle = currentNode.generateTitle(flowSession);
-            List<FlowRecord> recordList = new ArrayList<>();
+            recordList = new ArrayList<>();
             for (IFlowOperator operator : operators) {
                 FlowRecord record = currentNode.createRecord(workId, processId, preId, recordTitle, createOperator, operator, snapshot);
                 recordList.add(record);
             }
-            return recordList;
         }
+        if(!recordList.isEmpty()){
+            for (FlowRecord record:recordList){
+                if(opinion!=null){
+                    record.updateOpinion(opinion);
+                }
+            }
+        }
+
+        return recordList;
     }
 
 
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
@@ -310,7 +310,7 @@ public void startFlow(long workId, IFlowOperator operator, IBindData bindData, S
         );
 
         // 创建待办记录
-        List<FlowRecord> records = flowRecordBuilderService.createRecord(start, operator);
+        List<FlowRecord> records = flowRecordBuilderService.createRecord(start, operator, opinion);
         if (records.isEmpty()) {
             throw new IllegalArgumentException("flow record not found");
         }
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
@@ -66,14 +66,14 @@ void flowTest() {
         assertEquals(1, userTodos.size());
 
         FlowRecord userTodo = userTodos.get(0);
-        assertNull(userTodo.getOpinion());
         flowService.submitFlow(userTodo.getId(), lorne, leave, Opinion.pass("自己提交"));
 
         // 部门领导审批
         List<FlowRecord> deptTodos = flowRecordRepository.findTodoByOperatorId(lorne.getUserId(), pageRequest).getContent();
         assertEquals(1, deptTodos.size());
 
         FlowRecord deptTodo = deptTodos.get(0);
+        assertNull(deptTodo.getOpinion());
         flowService.transfer(deptTodo.getId(), lorne,boss, leave, "转交给领导审批通过");
 
         // 查看boss的待办
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>3.3.1</version>
+        <version>3.3.2.dev</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>3.3.1</version>
+        <version>3.3.2.dev</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 
