fix #121

Author: xlorne

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/event/FlowApprovalEvent.java

@@ -36,7 +36,8 @@ public class FlowApprovalEvent implements ISyncEvent {
     public static final int STATE_CIRCULATE = 9;
     // 保存
     public static final int STATE_SAVE = 10;
-
+    // 删除
+    public static final int STATE_DELETE = 11;
 
     private final int state;
     private final IFlowOperator operator;

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

@@ -41,8 +41,8 @@ public FlowService(FlowWorkRepository flowWorkRepository,
         this.flowServiceRepositoryHolder = new FlowServiceRepositoryHolder(flowWorkRepository, flowRecordRepository, flowBindDataRepository, flowOperatorRepository, flowProcessRepository, flowBackupRepository);
         this.flowDetailService = new FlowDetailService(flowWorkRepository, flowRecordRepository, flowBindDataRepository, flowOperatorRepository, flowProcessRepository);
         this.flowCustomEventService = new FlowCustomEventService(flowWorkRepository, flowRecordRepository, flowProcessRepository);
-        this.flowRecallService = new FlowRecallService(flowWorkRepository, flowRecordRepository, flowProcessRepository);
-        this.flowRemoveService = new FlowRemoveService(flowWorkRepository, flowRecordRepository, flowProcessRepository);
+        this.flowRecallService = new FlowRecallService(flowWorkRepository, flowRecordRepository, flowProcessRepository,flowBindDataRepository);
+        this.flowRemoveService = new FlowRemoveService(flowWorkRepository, flowRecordRepository, flowProcessRepository,flowBindDataRepository);
         this.flowSaveService = new FlowSaveService(flowWorkRepository, flowRecordRepository, flowBindDataRepository, flowProcessRepository);
         this.flowTransferService = new FlowTransferService(flowWorkRepository, flowRecordRepository, flowBindDataRepository, flowProcessRepository);
         this.flowPostponedService = new FlowPostponedService(flowWorkRepository, flowRecordRepository, flowProcessRepository);

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

@@ -1,5 +1,7 @@
 package com.codingapi.springboot.flow.service.impl;
 
+import com.codingapi.springboot.flow.bind.BindDataSnapshot;
+import com.codingapi.springboot.flow.bind.IBindData;
 import com.codingapi.springboot.flow.domain.FlowWork;
 import com.codingapi.springboot.flow.event.FlowApprovalEvent;
 import com.codingapi.springboot.flow.record.FlowRecord;
@@ -19,6 +21,7 @@ public class FlowRecallService {
     private final FlowWorkRepository flowWorkRepository;
     private final FlowRecordRepository flowRecordRepository;
     private final FlowProcessRepository flowProcessRepository;
+    private final FlowBindDataRepository flowBindDataRepository;
 
     /**
      * 撤回流程
@@ -44,6 +47,9 @@ public void recall(long recordId, IFlowOperator currentOperator) {
 
         // 下一流程的流程记录
         List<FlowRecord> childrenRecords = flowRecordRepository.findFlowRecordByPreId(recordId);
+
+        BindDataSnapshot bindDataSnapshot = flowBindDataRepository.getBindDataSnapshotById(flowRecord.getSnapshotId());
+
         // 下一流程均为办理且未读
 
         // 如果是在开始节点撤销，则直接删除
@@ -67,7 +73,8 @@ public void recall(long recordId, IFlowOperator currentOperator) {
 
             flowRecordRepository.delete(childrenRecords);
         }
+        IBindData bindData =  bindDataSnapshot.toBindData();
 
-        EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_RECALL, flowRecord, currentOperator, flowWork, null), true);
+        EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_RECALL, flowRecord, currentOperator, flowWork, bindData), true);
     }
 }

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

@@ -1,12 +1,18 @@
 package com.codingapi.springboot.flow.service.impl;
 
+import com.codingapi.springboot.flow.bind.BindDataSnapshot;
+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.event.FlowApprovalEvent;
 import com.codingapi.springboot.flow.record.FlowRecord;
+import com.codingapi.springboot.flow.repository.FlowBindDataRepository;
 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.service.FlowRecordVerifyService;
 import com.codingapi.springboot.flow.user.IFlowOperator;
+import com.codingapi.springboot.framework.event.EventPusher;
 import lombok.AllArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -17,6 +23,7 @@ public class FlowRemoveService {
     private final FlowWorkRepository flowWorkRepository;
     private final FlowRecordRepository flowRecordRepository;
     private final FlowProcessRepository flowProcessRepository;
+    private final FlowBindDataRepository flowBindDataRepository;
 
     /**
      * 删除流程
@@ -37,15 +44,19 @@ public void remove(long recordId, IFlowOperator currentOperator) {
         flowRecordVerifyService.loadFlowNode();
         flowRecordVerifyService.verifyFlowRecordNotFinish();
         flowRecordVerifyService.verifyFlowRecordIsTodo();
+        FlowWork flowWork = flowRecordVerifyService.getFlowWork();
         FlowNode flowNode =  flowRecordVerifyService.getFlowNode();
         FlowRecord flowRecord = flowRecordVerifyService.getFlowRecord();
 
         if(!flowNode.isStartNode()){
             throw new IllegalArgumentException("flow record not remove");
         }
+        BindDataSnapshot bindDataSnapshot = flowBindDataRepository.getBindDataSnapshotById(flowRecord.getSnapshotId());
+        IBindData bindData =  bindDataSnapshot.toBindData();
 
         flowProcessRepository.deleteByProcessId(flowRecord.getProcessId());
-
         flowRecordRepository.deleteByProcessId(flowRecord.getProcessId());
+
+        EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_DELETE, flowRecord, currentOperator, flowWork, bindData), true);
     }
 }