update 2.9.17

Author: xlorne

pom.xml

@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.9.16</version>
+    <version>2.9.17</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-authorization/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.16</version>
+        <version>2.9.17</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.16</version>
+        <version>2.9.17</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>2.9.16</version>
+        <version>2.9.17</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/build/FlowWorkBuilder.java

@@ -41,6 +41,11 @@ public FlowWorkBuilder postponedMax(int postponedMax) {
         return this;
     }
 
+    public FlowWorkBuilder skipIfSameApprover(boolean skipIfSameApprover) {
+        this.work.setSkipIfSameApprover(skipIfSameApprover);
+        return this;
+    }
+
     public FlowWorkBuilder title(String title) {
         this.work.setTitle(title);
         return this;

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/FlowWork.java

@@ -60,6 +60,12 @@ public class FlowWork {
      */
     private boolean enable;
 
+    /**
+     * 是否跳过相同审批人，默认为false
+     */
+    @Setter
+    private boolean skipIfSameApprover;
+
     /**
      * 最大延期次数
      */
@@ -122,6 +128,7 @@ public FlowWork copy(){
         flowWork.setTitle(this.getTitle());
         flowWork.setCode(RandomGenerator.randomString(8));
         flowWork.setPostponedMax(this.getPostponedMax());
+        flowWork.setSkipIfSameApprover(this.isSkipIfSameApprover());
         flowWork.schema(schema);
         return flowWork;
     }
@@ -225,6 +232,7 @@ public FlowWorkSerializable toSerializable() {
                 createUser.getUserId(),
                 createTime,
                 updateTime,
+                skipIfSameApprover,
                 enable,
                 postponedMax,
                 schema,

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

@@ -2,10 +2,12 @@
 
 import com.codingapi.springboot.flow.domain.FlowWork;
 import com.codingapi.springboot.flow.record.FlowRecord;
+import com.codingapi.springboot.flow.user.IFlowOperator;
 import lombok.Getter;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Getter
 public class FlowResult {
@@ -23,4 +25,14 @@ public FlowResult(FlowWork flowWork,FlowRecord flowRecord) {
         this.records = new ArrayList<>();
         this.records.add(flowRecord);
     }
+
+
+    /**
+     * 匹配操作者的记录
+     * @param operator 操作者
+     * @return 记录
+     */
+    public List<FlowRecord> matchRecordByOperator(IFlowOperator operator){
+        return records.stream().filter(record -> record.isOperator(operator)).collect(Collectors.toList());
+    }
 }

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/serializable/FlowWorkSerializable.java

@@ -63,6 +63,13 @@ public class FlowWorkSerializable implements Serializable {
      * 更新时间
      */
     private long updateTime;
+
+    /**
+     * 是否跳过相同审批人，默认为false
+     */
+    @Setter
+    private boolean skipIfSameApprover;
+
     /**
      * 是否启用
      */
@@ -140,6 +147,7 @@ public FlowWork toFlowWork(FlowOperatorRepository flowOperatorRepository) {
                 createTime,
                 updateTime,
                 enable,
+                skipIfSameApprover,
                 postponedMax,
                 flowNodes,
                 relations.stream().map((item) -> item.toFlowRelation(flowNodes)).collect(Collectors.toList()),

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowRecordVerifyService.java

@@ -5,6 +5,7 @@
 import com.codingapi.springboot.flow.record.FlowRecord;
 import com.codingapi.springboot.flow.repository.FlowProcessRepository;
 import com.codingapi.springboot.flow.repository.FlowRecordRepository;
+import com.codingapi.springboot.flow.repository.FlowWorkRepository;
 import com.codingapi.springboot.flow.user.IFlowOperator;
 import lombok.Getter;
 
@@ -16,37 +17,58 @@
 public class FlowRecordVerifyService {
 
     // constructor params
-    private final long recordId;
     @Getter
     private final IFlowOperator currentOperator;
 
     // register repository
     final FlowRecordRepository flowRecordRepository;
     final FlowProcessRepository flowProcessRepository;
+    final FlowWorkRepository flowWorkRepository;
 
     // load Object
     @Getter
     private FlowWork flowWork;
     @Getter
     private FlowNode flowNode;
     @Getter
-    private FlowRecord flowRecord;
+    private final FlowRecord flowRecord;
+
+    public FlowRecordVerifyService(
+            FlowWorkRepository flowWorkRepository,
+            FlowRecordRepository flowRecordRepository,
+            FlowProcessRepository flowProcessRepository,
+            long recordId,
+            IFlowOperator currentOperator) {
+        this.flowWorkRepository = flowWorkRepository;
+        this.flowRecordRepository = flowRecordRepository;
+        this.flowProcessRepository = flowProcessRepository;
 
-    public FlowRecordVerifyService(FlowRecordRepository flowRecordRepository,
+        this.currentOperator = currentOperator;
+        FlowRecord flowRecord = flowRecordRepository.getFlowRecordById(recordId);
+        if (flowRecord == null) {
+            throw new IllegalArgumentException("flow record not found");
+        }
+        this.flowRecord = flowRecord;
+    }
+
+    public FlowRecordVerifyService(FlowWorkRepository flowWorkRepository,
+                                   FlowRecordRepository flowRecordRepository,
                                    FlowProcessRepository flowProcessRepository,
-                                   long recordId,
+                                   FlowRecord flowRecord,
+                                   FlowWork flowWork,
                                    IFlowOperator currentOperator) {
+        this.flowWorkRepository = flowWorkRepository;
         this.flowRecordRepository = flowRecordRepository;
         this.flowProcessRepository = flowProcessRepository;
 
         this.currentOperator = currentOperator;
-        this.recordId = recordId;
+        this.flowRecord = flowRecord;
+        this.flowWork = flowWork;
     }
 
 
-
     /**
-     *  校验流程记录是否已提交状态
+     * 校验流程记录是否已提交状态
      */
     public void verifyFlowRecordSubmitState() {
         flowRecord.submitStateVerify();
@@ -56,13 +78,13 @@ public void verifyFlowRecordSubmitState() {
      * 校验流程是否当前操作者可操作的
      */
     public void verifyFlowRecordCurrentOperator() {
-        if(!currentOperator.isFlowManager()) {
+        if (!currentOperator.isFlowManager()) {
             flowRecord.matcherOperator(currentOperator);
         }
     }
 
     /**
-     *  校验流程是否已审批
+     * 校验流程是否已审批
      */
     public void verifyFlowRecordNotDone() {
         if (flowRecord.isDone()) {
@@ -72,7 +94,7 @@ public void verifyFlowRecordNotDone() {
 
 
     /**
-     *  校验流程是否已审批
+     * 校验流程是否已审批
      */
     public void verifyFlowRecordIsDone() {
         if (!flowRecord.isDone()) {
@@ -81,20 +103,19 @@ public void verifyFlowRecordIsDone() {
     }
 
 
-
     /**
-     *  校验流程是否未审批
+     * 校验流程是否未审批
      */
     public void verifyFlowRecordNotTodo() {
         if (flowRecord.isTodo()) {
-            if(!flowRecord.isStartRecord()) {
+            if (!flowRecord.isStartRecord()) {
                 throw new IllegalArgumentException("flow record is todo");
             }
         }
     }
 
     /**
-     *  校验流程是未审批
+     * 校验流程是未审批
      */
     public void verifyFlowRecordIsTodo() {
         if (!flowRecord.isTodo()) {
@@ -103,7 +124,7 @@ public void verifyFlowRecordIsTodo() {
     }
 
     /**
-     *  校验流程是否已完成
+     * 校验流程是否已完成
      */
     public void verifyFlowRecordNotFinish() {
         if (flowRecord.isFinish()) {
@@ -112,7 +133,7 @@ public void verifyFlowRecordNotFinish() {
     }
 
     /**
-     *  校验流程节点是否可编辑
+     * 校验流程节点是否可编辑
      */
     public void verifyFlowNodeEditableState(boolean editable) {
         // 流程节点不可编辑时，不能保存
@@ -123,41 +144,35 @@ public void verifyFlowNodeEditableState(boolean editable) {
 
 
     /**
-     *  校验转办人员不能是当前操作者
+     * 校验转办人员不能是当前操作者
      */
     public void verifyTargetOperatorIsNotCurrentOperator(IFlowOperator targetOperator) {
-        if(currentOperator.getUserId() == targetOperator.getUserId()){
+        if (currentOperator.getUserId() == targetOperator.getUserId()) {
             throw new IllegalArgumentException("current operator is target operator");
         }
     }
 
 
     /**
-     *  获取流程记录对象
-     */
-    public void loadFlowRecord() {
-        FlowRecord flowRecord = flowRecordRepository.getFlowRecordById(recordId);
-        if (flowRecord == null) {
-            throw new IllegalArgumentException("flow record not found");
-        }
-        this.flowRecord = flowRecord;
-    }
-
-    /**
-     *  获取流程设计对象
+     * 获取流程设计对象
      */
     public void loadFlowWork() {
-        FlowWork flowWork = flowProcessRepository.getFlowWorkByProcessId(flowRecord.getProcessId());
-        if (flowWork == null) {
-            throw new IllegalArgumentException("flow work not found");
+        if (this.flowWork == null) {
+            FlowWork flowWork = flowProcessRepository.getFlowWorkByProcessId(flowRecord.getProcessId());
+            if (flowWork == null) {
+                flowWork = flowWorkRepository.getFlowWorkByCode(flowRecord.getWorkCode());
+            }
+            if (flowWork == null) {
+                throw new IllegalArgumentException("flow work not found");
+            }
+            flowWork.enableValidate();
+            this.flowWork = flowWork;
         }
-        flowWork.enableValidate();
-        this.flowWork = flowWork;
     }
 
 
     /**
-     *  获取流程节点对象
+     * 获取流程节点对象
      */
     public void loadFlowNode() {
         FlowNode flowNode = flowWork.getNodeByCode(flowRecord.getNodeCode());
@@ -168,11 +183,11 @@ public void loadFlowNode() {
     }
 
     /**
-     *  标记流程为已读状态
+     * 标记流程为已读状态
      */
     public void setFlowRecordRead() {
         if (currentOperator != null) {
-            if(flowRecord.isOperator(currentOperator)) {
+            if (flowRecord.isOperator(currentOperator)) {
                 if (!flowRecord.isRead()) {
                     flowRecord.read();
                     flowRecordRepository.update(flowRecord);