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 getProjectCertificationInventoryEOS(List projectCertificationInventoryEOList) { + public List getProjectCertificationInventoryEOS(List projectCertificationInventoryEOList) { //认证清单关联平台件(实际是一个认证清单只关联一个平台件) List projectCertificationInventoryIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getId).collect(Collectors.toList()); List lawsInventoryPlatformEOList = new ArrayList<>(); @@ -2766,7 +2766,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl getProjectLawsInventoryEOS(List projectLawsInventoryEOList) { + public List getProjectLawsInventoryEOS(List projectLawsInventoryEOList) { List 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 pliEos = pliEoList.stream().filter(pliEo -> StringUtils.equals(pliEo.getProjectLibraryId(), plbEo.getId())).collect(Collectors.toList()); + pliEos = projectLibraryBaseService.getProjectLawsInventoryEOS(pliEos); + Map fgRwqrMapDesign = this.projectLawsInventoryEOService.groupByFGRwqrStatusDesign(pliEos); Map fgRwqrProjectScheduleExportMapDesign = (Map) fgRwqrMapDesign.get("projectScheduleExportMap"); double fgrqqrToBeReleasedDesign = (double) fgRwqrProjectScheduleExportMapDesign.get("toBeReleased"); @@ -1126,6 +1128,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService //认证任务确认 List pciEos = pciEoList.stream().filter(pciEo -> StringUtils.equals(pciEo.getProjectLibraryId(), plbEo.getId())).collect(Collectors.toList()); + pciEos = projectLibraryBaseService.getProjectCertificationInventoryEOS(pciEos); Map rzRwqrMap = this.projectCertificationInventoryEOService.groupByFGRwqrStatus(pciEos); Map rzRwqrProjectScheduleExportMap = (Map) rzRwqrMap.get("projectScheduleExportMap"); double rzRqqrToBeReleased = (double) rzRwqrProjectScheduleExportMap.get("toBeReleased");