触发重新归档

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

@@ -2,6 +2,7 @@
 
 package com.srm.bpm.logic.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Optional;
 import com.google.common.base.Strings;
@@ -629,8 +630,19 @@ public class BillBpmnLogicImpl implements BillBpmnLogic {
 
             final BillTaskEntity lastTask = billTasks.get(0);
 
+            //再查询最后一个节点的所有审批人
+            List<BillTaskEntity> list = billTaskService.list(
+                    Wrappers.lambdaQuery(BillTaskEntity.class)
+                            .eq(BillTaskEntity::getSort, lastTask.getSort())
+                            .eq(BillTaskEntity::getIsDeleted, 0)
+            );
+
+            //如果全部为2(同意)则触发回调
+            boolean allMatch = list.stream().allMatch(f -> f.getNodeStatus().equals(BillTaskStatus.AGREE.getStatus()));
+            if(!allMatch)return;
+
             // 检查最后一个节点的审批状态是否为 2（已同意）
-            if (lastTask.getNodeStatus() == BillTaskStatus.AGREE.getStatus()) {
+            //if (lastTask.getNodeStatus() == BillTaskStatus.AGREE.getStatus()) {
                 // 检查最后一个任务是否是归档节点
                 final Long processId = latestBill.getProcessId();
                 if (processId != null && !Strings.isNullOrEmpty(lastTask.getTaskNodeKey())) {
@@ -649,7 +661,7 @@ public class BillBpmnLogicImpl implements BillBpmnLogic {
                         }
                     }
                 }
-            }
+            //}
         } catch (Exception e) {
             log.error("检查归档条件并触发回调时发生异常。billId: {}, taskId: {}, 错误: {}",
                     bill != null ? bill.getId() : null, taskId, e.getMessage(), e);