触发重新归档条件校验

bpm-core/src/main/java/com/srm/bpm/logic/service/impl/BillBpmnLogicImpl.java

@@ -637,9 +637,21 @@ public class BillBpmnLogicImpl implements BillBpmnLogic {
                             .eq(BillTaskEntity::getIsDeleted, 0)
             );
 
-            //如果全部为2(同意)则触发回调
-            boolean allMatch = list.stream().allMatch(f -> f.getNodeStatus().equals(BillTaskStatus.AGREE.getStatus()));
-            if(!allMatch)return;
+
+            //如果有一个是拒绝，或者全部为同意，或者有一个是自动跳过，或者为撤销，则触发回调
+            boolean refuseStatus = list.stream().anyMatch(f -> f.getNodeStatus().equals(BillTaskStatus.REFUSE.getStatus()));
+
+            boolean agreeStatus = list.stream().allMatch(f -> f.getNodeStatus().equals(BillTaskStatus.AGREE.getStatus()));
+
+            boolean skipStatus = list.stream().anyMatch(f -> f.getNodeStatus().equals(BillTaskStatus.SKIP.getStatus()));
+
+            boolean cancelStatus = list.stream().anyMatch(f -> f.getNodeStatus().equals(BillTaskStatus.CANCEL.getStatus()));
+
+
+            if(!refuseStatus && !agreeStatus && !skipStatus && !cancelStatus){
+                return;
+            }
+
 
             // 检查最后一个节点的审批状态是否为 2（已同意）
             //if (lastTask.getNodeStatus() == BillTaskStatus.AGREE.getStatus()) {