fix #30

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/context/RepositoryHolderContext.java

@@ -228,7 +228,7 @@ private void saveTodoMargeRecords() {
                     } else {
                         todoMargeRecord.update(flowRecord);
                         if (flowRecord.isMergeable()) {
-                            todoMargeRecord.addMargeCount();
+                            todoMargeRecord.addMergeCount();
                         }
                     }
                     flowTodoRecords.add(todoMargeRecord);
@@ -267,8 +267,8 @@ private void removeTodoMergeRecords() {
                                 for (FlowTodoMerge margeRelation : margeRelations) {
                                     if (margeRelation.isRecord(flowRecord.getId())) {
                                         flowTodoMergeRepository.remove(margeRelation);
-                                        todoMargeRecord.divMargeCount();
-                                        if (todoMargeRecord.hasMargeCount()) {
+                                        todoMargeRecord.divMergeCount();
+                                        if (todoMargeRecord.hasMergeCount()) {
                                             flowTodoRecordRepository.save(todoMargeRecord);
                                         } else {
                                             flowTodoRecordRepository.remove(todoMargeRecord);

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

@@ -5,14 +5,14 @@
 import lombok.Setter;
 
 /**
- *  待办记录数据，所有的待办列表
+ * 待办记录数据，所有的待办列表（自动合并记录）
  */
 @Getter
 @AllArgsConstructor
 public class FlowTodoRecord {
 
     /**
-     * 合并记录id
+     * 待办记录id (todoId,无业务属性，流程处理还是通过recordId来处理)
      */
     @Setter
     private long id;
@@ -81,6 +81,7 @@ public class FlowTodoRecord {
 
     /**
      * 合并记录数量
+     * 当 {@link FlowTodoRecord#mergeable} 为true时，该字段有效,否则为0
      */
     private int margeCount;
 
@@ -101,11 +102,12 @@ public class FlowTodoRecord {
 
 
     public FlowTodoRecord(FlowRecord flowRecord) {
-       this.update(flowRecord);
+        this.update(flowRecord);
+        this.margeCount = flowRecord.isMergeable() ? 1 : 0;
     }
 
 
-    public void update(FlowRecord flowRecord){
+    public void update(FlowRecord flowRecord) {
         this.processId = flowRecord.getProcessId();
         this.workBackupId = flowRecord.getWorkBackupId();
         this.workCode = flowRecord.getWorkCode();
@@ -124,20 +126,29 @@ public void update(FlowRecord flowRecord){
         this.timeoutTime = flowRecord.getTimeoutTime();
     }
 
-    public void addMargeCount(){
-        if(this.mergeable) {
+    /**
+     * 添加合并记录数量
+     */
+    public void addMergeCount() {
+        if (this.mergeable) {
             this.margeCount++;
         }
     }
 
-    public void divMargeCount(){
-        if(this.mergeable) {
+    /**
+     * 减去合并记录数量
+     */
+    public void divMergeCount() {
+        if (this.mergeable) {
             this.margeCount--;
         }
     }
 
-    public boolean hasMargeCount(){
-        return this.mergeable && this.margeCount >= 0;
+    /**
+     * 是否有合并记录数量
+     */
+    public boolean hasMergeCount() {
+        return this.mergeable && this.margeCount > 0;
     }
 
 }