add FlowDetail.java opinions

Author: xlorne

example/example-application/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.2.1.dev</version>
+        <version>3.3.2.2.dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-domain/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.2.1.dev</version>
+        <version>3.3.2.2.dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-infra-flow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.2.1.dev</version>
+        <version>3.3.2.2.dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-infra-jpa/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.2.1.dev</version>
+        <version>3.3.2.2.dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.2.1.dev</version>
+        <version>3.3.2.2.dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/pom.xml

@@ -13,11 +13,11 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.2.1.dev</version>
+        <version>3.3.2.2.dev</version>
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.2.1.dev</version>
+    <version>3.3.2.2.dev</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.2.1.dev</version>
+    <version>3.3.2.2.dev</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.2.1.dev</version>
+        <version>3.3.2.2.dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-flow/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.2.1.dev</version>
+        <version>3.3.2.2.dev</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/pojo/FlowDetail.java

@@ -4,6 +4,7 @@
 import com.codingapi.springboot.flow.bind.IBindData;
 import com.codingapi.springboot.flow.domain.FlowNode;
 import com.codingapi.springboot.flow.domain.FlowWork;
+import com.codingapi.springboot.flow.domain.Opinion;
 import com.codingapi.springboot.flow.record.FlowRecord;
 import com.codingapi.springboot.flow.user.IFlowOperator;
 import lombok.Getter;
@@ -12,30 +13,85 @@
 
 
 /**
- *  流程详情的阻止对象
+ * 流程详情的阻止对象
  */
 @Getter
 public class FlowDetail {
 
+    /**
+     * 当前流程
+     */
     private final FlowRecord flowRecord;
+    /**
+     * 流程设计器
+     */
     private final FlowWork flowWork;
+    /**
+     * 流程节点
+     */
     private final FlowNode flowNode;
+    /**
+     * 历史流程
+     */
     private final List<FlowRecord> historyRecords;
-    private final BindDataSnapshot snapshot;
+    /**
+     * 绑定数据
+     */
     private final IBindData bindData;
+    /**
+     * 全部的操作人
+     */
     private final List<? extends IFlowOperator> operators;
 
+    /**
+     * 创建者
+     */
+    private final IFlowOperator flowCreator;
+
+    /**
+     * 创建时间
+     */
+    private final long flowCreateTime;
+
+    /**
+     * 流程的意见
+     */
+    private final List<FlowOpinion> opinions;
+
+
     public FlowDetail(FlowRecord flowRecord,
                       BindDataSnapshot snapshot,
                       FlowWork flowWork,
                       List<FlowRecord> historyRecords,
-                        List<? extends IFlowOperator> operators) {
+                      List<? extends IFlowOperator> operators) {
         this.operators = operators;
         this.flowRecord = flowRecord;
-        this.snapshot = snapshot;
         this.flowWork = flowWork;
         this.bindData = snapshot.toBindData();
-        this.historyRecords = historyRecords;
+        this.historyRecords = historyRecords.
+                stream().
+                sorted((o1, o2) -> (int) (o1.getCreateTime() - o2.getCreateTime()))
+                .toList();
+        this.opinions = historyRecords.stream().map(FlowOpinion::new).toList();
+        this.flowCreator = operators.stream().filter(o -> o.getUserId() == flowRecord.getCreateOperatorId()).findFirst().orElse(null);
+        this.flowCreateTime = flowRecord.getCreateTime();
         this.flowNode = flowWork.getNodeByCode(flowRecord.getNodeCode());
     }
+
+
+    @Getter
+    public final class FlowOpinion {
+        private final long recordId;
+        private final Opinion opinion;
+        private final IFlowOperator operator;
+        private final long createTime;
+
+        public FlowOpinion(FlowRecord flowRecord) {
+            this.recordId = flowRecord.getId();
+            this.opinion = flowRecord.getOpinion();
+            this.operator = operators.stream().filter(o -> o.getUserId() == flowRecord.getCurrentOperatorId()).findFirst().orElse(null);
+            this.createTime = flowRecord.getUpdateTime();
+        }
+    }
+
 }