From 3d3cd7274e315dd3f98a43840b2700b204ea2569 Mon Sep 17 00:00:00 2001 From: climba Date: Fri, 10 Jan 2025 19:56:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=201.=20=E5=BE=85=E5=8A=9E=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=B8=8D=E5=8C=85=E5=90=AB=E5=B7=B2=E7=BB=88=E6=AD=A2?= =?UTF-8?q?=E7=9A=84=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java index 49167e2..1b59282 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java @@ -353,6 +353,10 @@ public class WorkbenchManage { Map> projectPurchaseMap) { return CollUtil.count(projectStatusChanges.entrySet(), w -> { List changes = w.getValue(); + if (CollUtil.anyMatch(changes, w1 -> ProjectStateChangeEvent.STOPPED_APPLY_PASS.eq(w1.getEvent()) + || ProjectStateChangeEvent.STOPPED_APPLY_AUTO_PASS.eq(w1.getEvent()))) { + return false; + } if (startEvent.equals(ProjectStateChangeEvent.SUBMIT_PURCHASE_CONTRACT_RECORD)) { Long projectId = ProjectIdCodeCacheUtil.newest(w.getKey()); List purchases = projectPurchaseMap.getOrDefault(projectId, Collections.emptyList()); @@ -434,7 +438,7 @@ public class WorkbenchManage { currStat.setReviewingCount(reviewing); currStat.setReviewFailedCount(reviewFailed); currStat.setPendingCount(processNodeNotFinishedCount(projectStatusChangeMap, - ProjectStateChangeEvent.COMPLIANCE_REVIEW_PASS, ProjectStateChangeEvent.PROJECT_REVIEW_PASS, + ProjectStateChangeEvent.PROJECT_APPLICATION_SUBMIT, ProjectStateChangeEvent.PROJECT_REVIEW_PASS, projectPurchaseCountMap)); } break; @@ -672,7 +676,7 @@ public class WorkbenchManage { break; case PROJECT_REVIEW: projectProcessNodeFinishedQuery(query, req.getProcessNodeFinished(), - ProjectStateChangeEvent.COMPLIANCE_REVIEW_PASS, ProjectStateChangeEvent.PROJECT_REVIEW_PASS); + ProjectStateChangeEvent.PROJECT_APPLICATION_SUBMIT, ProjectStateChangeEvent.PROJECT_REVIEW_PASS); break; case APPROVAL_AMOUNT: if (Boolean.FALSE.equals(req.getProcessNodeFinished())) {