From 31ef398a13fc6a9c79ccaa4ad31f3757d0d4abed Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Dec 2023 17:14:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/ProjectLibraryBaseServiceImpl.java   | 4 ++--
 .../project/service/impl/ProjectStatusBoardServiceImpl.java   | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 659fb013d..3954a57f7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -2719,7 +2719,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		return result;
 	}
 
-	private List<ProjectCertificationInventoryEO> getProjectCertificationInventoryEOS(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList) {
+	public List<ProjectCertificationInventoryEO> getProjectCertificationInventoryEOS(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList) {
 		//认证清单关联平台件（实际是一个认证清单只关联一个平台件）
 		List<String> projectCertificationInventoryIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getId).collect(Collectors.toList());
 		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = new ArrayList<>();
@@ -2766,7 +2766,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	}
 
 	@NotNull
-	private List<ProjectLawsInventoryEO> getProjectLawsInventoryEOS(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+	public List<ProjectLawsInventoryEO> getProjectLawsInventoryEOS(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
 		List<String> projectLawsInventoryIdList = projectLawsInventoryEOList.stream()
 				.distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
 		//法规清单关联的所有平台件
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
index c1c7b6514..022bc4220 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
@@ -1032,6 +1032,8 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
             }
             //设计任务确认
             List<ProjectLawsInventoryEO> pliEos = pliEoList.stream().filter(pliEo -> StringUtils.equals(pliEo.getProjectLibraryId(), plbEo.getId())).collect(Collectors.toList());
+            pliEos = projectLibraryBaseService.getProjectLawsInventoryEOS(pliEos);
+
             Map<String,Object> fgRwqrMapDesign = this.projectLawsInventoryEOService.groupByFGRwqrStatusDesign(pliEos);
             Map<String,Object> fgRwqrProjectScheduleExportMapDesign = (Map<String, Object>) fgRwqrMapDesign.get("projectScheduleExportMap");
             double fgrqqrToBeReleasedDesign = (double) fgRwqrProjectScheduleExportMapDesign.get("toBeReleased");
@@ -1126,6 +1128,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
 
             //认证任务确认
             List<ProjectCertificationInventoryEO> pciEos = pciEoList.stream().filter(pciEo -> StringUtils.equals(pciEo.getProjectLibraryId(), plbEo.getId())).collect(Collectors.toList());
+            pciEos = projectLibraryBaseService.getProjectCertificationInventoryEOS(pciEos);
             Map<String,Object> rzRwqrMap = this.projectCertificationInventoryEOService.groupByFGRwqrStatus(pciEos);
             Map<String,Object> rzRwqrProjectScheduleExportMap = (Map<String, Object>) rzRwqrMap.get("projectScheduleExportMap");
             double rzRqqrToBeReleased = (double) rzRwqrProjectScheduleExportMap.get("toBeReleased");