From 8971a386b670d223095cfc0053780384e13f7884 Mon Sep 17 00:00:00 2001
From: WendyYang <realwendyyang@qq.com>
Date: Fri, 12 Jul 2024 11:37:07 +0800
Subject: [PATCH] =?UTF-8?q?modify:=201.=20=E9=A6=96=E9=A1=B5=E6=A0=87?=
 =?UTF-8?q?=E6=AE=B5=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pm/api/workbench/manage/WorkbenchManage.java   | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 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 2e1dd2f..f570d08 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
@@ -60,6 +60,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
+import java.util.function.ToLongBiFunction;
 import java.util.function.ToLongFunction;
 import java.util.stream.Collectors;
 
@@ -227,12 +228,12 @@ public class WorkbenchManage {
             Map<Long, Long> projBizMap = purchaseEventMap.getOrDefault(event.name(), Collections.emptyMap());
             return projBizMap.values().stream().mapToLong(l -> l).sum();
         };
-        ToLongFunction<AbstractStateChangeEvent> countProject = event -> {
+        ToLongBiFunction<AbstractStateChangeEvent, ProcessNode> countProject = (event, node) -> {
             Map<Long, Long> projBizMap = purchaseEventMap.getOrDefault(event.name(), Collections.emptyMap());
-            if (event.name().equals(ProcessNode.PROJECT_ADAPTION.name())
-                    || event.name().equals(ProcessNode.SYSTEM_SELF_TEST.name())
-                    || event.name().equals(ProcessNode.SYSTEM_TEST_VALID.name())
-                    || event.name().equals(ProcessNode.XCFHX_REVIEW.name())) {
+            if (node.equals(ProcessNode.PROJECT_ADAPTION)
+                    || node.equals(ProcessNode.SYSTEM_SELF_TEST)
+                    || node.equals(ProcessNode.SYSTEM_TEST_VALID)
+                    || node.equals(ProcessNode.XCFHX_REVIEW)) {
                 return projBizMap.size();
             } else {
                 return projectPurchaseCountMap.entrySet().stream().filter(w -> {
@@ -284,7 +285,7 @@ public class WorkbenchManage {
                         projectCount = projectPurchaseCountMap.size();
                         if (bidCount > 0) {
                             Wrapper<PurchaseStatusChange> pQuery = Wrappers.lambdaQuery(PurchaseStatusChange.class)
-                                    .select(PurchaseStatusChange::getEvent)
+                                    .select(PurchaseStatusChange::getEvent,PurchaseStatusChange::getProjectId)
                                     .in(PurchaseStatusChange::getProjectId, allVersionProjectIds)
                                     .in(PurchaseStatusChange::getEvent, AdaptStateChangeEvent.ADAPT_INFO_PASSED,
                                             SelfTestStateChangeEvent.SELF_TEST_PASSED,
@@ -302,29 +303,29 @@ public class WorkbenchManage {
                         break;
                     case PROJECT_ADAPTION:
                         bidCount = countPurchase.applyAsLong(AdaptStateChangeEvent.ADAPT_INFO_PASSED);
-                        projectCount = countProject.applyAsLong(AdaptStateChangeEvent.ADAPT_INFO_PASSED);
+                        projectCount = countProject.applyAsLong(AdaptStateChangeEvent.ADAPT_INFO_PASSED, node);
                         break;
                     case SYSTEM_SELF_TEST:
                         bidCount = countPurchase.applyAsLong(SelfTestStateChangeEvent.SELF_TEST_PASSED);
-                        projectCount = countProject.applyAsLong(SelfTestStateChangeEvent.SELF_TEST_PASSED);
+                        projectCount = countProject.applyAsLong(SelfTestStateChangeEvent.SELF_TEST_PASSED, node);
                         break;
                     case SYSTEM_TEST_VALID:
                         bidCount = countPurchase.applyAsLong(TestValidStateChangeEvent.TEST_VALID_INFO_PASSED);
-                        projectCount = countProject.applyAsLong(TestValidStateChangeEvent.TEST_VALID_INFO_PASSED);
+                        projectCount = countProject.applyAsLong(TestValidStateChangeEvent.TEST_VALID_INFO_PASSED, node);
                         break;
                     case FIRST_INSPECTED:
                     case PILOT_RUNNING:
                         // 初验试运行数量同步
                         bidCount = countPurchase.applyAsLong(TenderStateChangeEvent.SUBMIT_FIRST_INSPECTED_FILES);
-                        projectCount = countProject.applyAsLong(TenderStateChangeEvent.SUBMIT_FIRST_INSPECTED_FILES);
+                        projectCount = countProject.applyAsLong(TenderStateChangeEvent.SUBMIT_FIRST_INSPECTED_FILES, node);
                         break;
                     case XCFHX_REVIEW:
                         bidCount = countPurchase.applyAsLong(XcfhxStateChangeEvent.XCFHX_APPLY_PASSED);
-                        projectCount = countProject.applyAsLong(XcfhxStateChangeEvent.XCFHX_APPLY_PASSED);
+                        projectCount = countProject.applyAsLong(XcfhxStateChangeEvent.XCFHX_APPLY_PASSED, node);
                         break;
                     case FINAL_INSPECTED:
                         bidCount = countPurchase.applyAsLong(TenderStateChangeEvent.FINALLY_INSPECTED_PASSED);
-                        projectCount = countProject.applyAsLong(TenderStateChangeEvent.FINALLY_INSPECTED_PASSED);
+                        projectCount = countProject.applyAsLong(TenderStateChangeEvent.FINALLY_INSPECTED_PASSED, node);
                         break;
                     default:
                         break;