diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java index ed36a3a1a..f205301bb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java @@ -261,16 +261,14 @@ public interface IProjectCertificationInventoryEOService extends IService> getTaskToConfirmStatistics(List pciEoList, - List projectCertificationInventoryEOList); + List> getTaskToConfirmStatistics(List pciEoList); /** * 获取Pre-Homo统计信息 * @param pciEoList * @return */ - List> getPrehomoStatistice(List pciEoList - ,List projectCertificationInventoryEOList); + List> getPrehomoStatistice(List pciEoList); /** * 获取认证进度统计信息 全部 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index 0c6997549..17828c496 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -271,32 +271,28 @@ public interface IProjectLawsInventoryEOService extends IService> getDesignTaskToConfirmStatistics(List projectLawsInventoryEOList, - List projectLawsInventoryPlatFormList); + List> getDesignTaskToConfirmStatistics(List projectLawsInventoryEOList); /** * 验证任务确认 * @param projectLawsInventoryEOList * @return */ - List> getVerifyTaskToConfirmStatistics(List projectLawsInventoryEOList, - List projectLawsInventoryPlatFormList); + List> getVerifyTaskToConfirmStatistics(List projectLawsInventoryEOList); /** * 获取设计符合性统计信息 * @param projectLawsInventoryEOList * @return */ - List> getDesignComplianceStatistice(List projectLawsInventoryEOList, - List projectLawsInventoryPlatFormList); + List> getDesignComplianceStatistice(List projectLawsInventoryEOList); /** * 获取验证符合性统计信息 * @param projectLawsInventoryEOList * @return */ - List> getVerifyComplianceStatistice(List projectLawsInventoryEOList, - List projectLawsInventoryPlatFormList); + List> getVerifyComplianceStatistice(List projectLawsInventoryEOList); List> queryNotComplianList(Map params); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index f65235c85..f87f528f6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -3296,8 +3296,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl> getTaskToConfirmStatistics(List pciEoList, - List projectCertificationInventoryEOList) { + public List> getTaskToConfirmStatistics(List pciEoList) { List> result = new ArrayList<>(); int listToBeReleasedCount = 0;//清单待发布 @@ -3347,40 +3346,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl { - boolean flag = ( - StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) - ); - return flag; - }).count(); - // 任务待确认 - taskToBeConfirmedCount += (int) projectCertificationInventoryEOList.stream().filter(pciEo -> { - boolean flag = ( - StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) - ); - return flag; - }).count(); - // 责任人接受 - acceptedCount += (int) projectCertificationInventoryEOList.stream().filter(pciEo -> { - boolean flag = ( - StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) - || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) - || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()) - || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()) - ); - return flag; - }).count(); - // 责任人拒绝 - rejectedCount += (int) projectCertificationInventoryEOList.stream().filter(pciEo -> { - boolean flag = ( - StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue()) - ); - return flag; - }).count(); - } Map listToBeReleasedMap = new HashMap<>(); Map taskToBeInitiatedMap = new HashMap<>(); @@ -3412,8 +3377,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl> getPrehomoStatistice(List pciEoList, - List projectCertificationInventoryEOList) { + public List> getPrehomoStatistice(List pciEoList) { List> result = new ArrayList<>(); int taskToBeConfirmedCount = 0;//任务待确认 @@ -3464,48 +3428,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl { - boolean flag = ( - StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) - || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue()) - || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) - || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) - || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue()) - ); - return flag; - }).count(); - // 结果待提交 - resultsToBeSubmittedCount += (int) projectCertificationInventoryEOList.stream().filter(pciEo -> { - boolean flag = ( - StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) - ); - return flag; - }).count(); - // 结果待审查 - resultsToBeReviewedCount += (int) projectCertificationInventoryEOList.stream().filter(pciEo -> { - boolean flag = ( - StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) - ); - return flag; - }).count(); - // 审查通过 - reviewAndPassCount += (int) projectCertificationInventoryEOList.stream().filter(pciEo -> { - boolean flag = ( - StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()) - ); - return flag; - }).count(); - // 审查退回 - reviewAndReturnCount += (int) projectCertificationInventoryEOList.stream().filter(pciEo -> { - boolean flag = ( - StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()) - ); - return flag; - }).count(); - } Map taskToBeConfirmedMap = new HashMap<>(); Map resultsToBeSubmittedMap = new HashMap<>(); Map resultsToBeReviewedMap = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index d2d6d8178..7c4f1c26b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -10299,8 +10299,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> getDesignTaskToConfirmStatistics(List projectLawsInventoryEOList, - List projectLawsInventoryPlatFormList) { + public List> getDesignTaskToConfirmStatistics(List projectLawsInventoryEOList) { List> result = new ArrayList<>(); int listToBeReleasedCount = 0;//清单待发布 @@ -10308,11 +10307,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { + listToBeReleasedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) @@ -10321,7 +10318,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { + taskToBeInitiatedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) ); @@ -10329,7 +10326,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { + taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) ); @@ -10337,7 +10334,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { + acceptedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) @@ -10349,45 +10346,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { - boolean flag = ( - StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) - ); - return flag; - }).count(); - } - //平台件数据统计----------------------------------------------- - if(CollectionUtils.isNotEmpty(projectLawsInventoryPlatFormList)){ - // 任务待发起 - taskToBeInitiatedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) - ); - return flag; - }).count(); - - // 任务待确认 - taskToBeConfirmedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) - ); - return flag; - }).count(); - - // 责任人接收 - acceptedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) - ); - return flag; - }).count(); - - // 责任人拒绝 - rejectedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> { + rejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) ); @@ -10430,8 +10389,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> getVerifyTaskToConfirmStatistics(List projectLawsInventoryEOList, - List projectLawsInventoryPlatFormList) { + public List> getVerifyTaskToConfirmStatistics(List projectLawsInventoryEOList) { List> result = new ArrayList<>(); int listToBeReleasedCount = 0;//清单待发布 @@ -10486,44 +10444,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) - ); - return flag; - }).count(); - - // 任务待确认 - taskToBeConfirmedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) - ); - return flag; - }).count(); - - // 责任人接收 - acceptedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) - ); - return flag; - }).count(); - - // 责任人拒绝 - rejectedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) - ); - return flag; - }).count(); - } Map listToBeReleasedMap = new HashMap<>();//清单待发布 Map taskToBeInitiatedMap = new HashMap<>();//任务待发起 @@ -10555,8 +10475,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> getDesignComplianceStatistice(List projectLawsInventoryEOList, - List projectLawsInventoryPlatFormList) { + public List> getDesignComplianceStatistice(List projectLawsInventoryEOList) { List> result = new ArrayList<>(); int taskToBeConfirmedCount = 0;//任务待确认 int resultsToBeSubmittedCount = 0;//结果待提交 @@ -10617,59 +10536,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { - boolean flag = ( - StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) - || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) - - ); - return flag; - }).count(); - - // 结果待提交 - resultsToBeSubmittedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) - ); - return flag; - }).count(); - - // 结果待审查 - resultsToBeReviewedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) - ); - return flag; - }).count(); - - // 符合 - complianceCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) - ); - return flag; - }).count(); - // 不符合 - nonComplianceCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) - ); - return flag; - }).count(); - // 待追踪 - toBeTrackedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) - ); - return flag; - }).count(); - } Map taskToBeConfirmedMap = new HashMap<>(); Map resultsToBeSubmittedMap = new HashMap<>(); @@ -10706,8 +10572,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> getVerifyComplianceStatistice(List projectLawsInventoryEOList, - List projectLawsInventoryPlatFormList) { + public List> getVerifyComplianceStatistice(List projectLawsInventoryEOList) { List> result = new ArrayList<>(); int taskToBeConfirmedCount = 0;//任务待确认 int resultsToBeSubmittedCount = 0;//结果待提交 @@ -10768,59 +10633,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) - || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) - - ); - return flag; - }).count(); - - // 结果待提交 - resultsToBeSubmittedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) - ); - return flag; - }).count(); - - // 结果待审查 - resultsToBeReviewedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) - ); - return flag; - }).count(); - - // 符合 - complianceCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue()) - ); - return flag; - }).count(); - // 不符合 - nonComplianceCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) - ); - return flag; - }).count(); - // 待追踪 - toBeTrackedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) - ); - return flag; - }).count(); - } Map taskToBeConfirmedMap = new HashMap<>(); Map resultsToBeSubmittedMap = new HashMap<>(); 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 4016b3285..a94a2e42a 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 @@ -2202,39 +2202,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl projectLawsInventoryIdList = projectLawsInventoryEOList.stream() - .distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList()); - //法规清单关联的所有平台件 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,projectLawsInventoryIdList); - List lawsInventoryPlatformEOList = lawsInventoryPlatformEOService.list(wrapper); - //区分哪些法规清单关联了平台件,哪些法规清单没有关联平台件 - List yesList = new ArrayList<>(); - List noList = new ArrayList<>(); - List projectLawsInventoryPlatFormList = new ArrayList<>(); - if(ObjectUtils.isNotEmpty(lawsInventoryPlatformEOList)){ - //所关联平台件的法规清单id - List idList = lawsInventoryPlatformEOList.stream() - .map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList()); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(ProjectLawsInventoryEO::getId,idList); - projectLawsInventoryPlatFormList = projectLawsInventoryEOMapper.selectList(queryWrapper); - for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) { - List collect = lawsInventoryPlatformEOList.stream() - .filter(e -> e.getLawsInventoryId().equals(projectLawsInventoryEO.getId())).collect(Collectors.toList()); - if(ObjectUtils.isNotEmpty(collect)){ - yesList.add(projectLawsInventoryEO); - }else{ - noList.add(projectLawsInventoryEO); - } - } - } - if(ObjectUtils.isEmpty(noList)){ - noList = projectLawsInventoryEOList; - } + //法规清单绑定平台件,需要特殊处理 + projectLawsInventoryEOList = getProjectLawsInventoryEOS(projectLawsInventoryEOList); //设计任务确认 List> designTaskToConfirmMapList = - this.projectLawsInventoryEOService.getDesignTaskToConfirmStatistics(noList,projectLawsInventoryPlatFormList); + this.projectLawsInventoryEOService.getDesignTaskToConfirmStatistics(projectLawsInventoryEOList); int designTaskAffirmStatusCount = 0; if(CollectionUtils.isNotEmpty(designTaskToConfirmMapList)){ @@ -2249,7 +2221,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> verifyTaskToConfirmMapList - = this.projectLawsInventoryEOService.getVerifyTaskToConfirmStatistics(noList,projectLawsInventoryPlatFormList); + = this.projectLawsInventoryEOService.getVerifyTaskToConfirmStatistics(projectLawsInventoryEOList); int verifyTaskAffirmStatusCount = 0; if(CollectionUtils.isNotEmpty(verifyTaskToConfirmMapList)){ //taskAffirmStatusCount @@ -2263,7 +2235,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> designComplianceMapList - = this.projectLawsInventoryEOService.getDesignComplianceStatistice(noList,projectLawsInventoryPlatFormList); + = this.projectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList); int designFlowTaskStatusCount = 0; if(CollectionUtils.isNotEmpty(designComplianceMapList)){ for (Map designCompliance : designComplianceMapList) { @@ -2276,7 +2248,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> verifyComplianceMapList - = this.projectLawsInventoryEOService.getVerifyComplianceStatistice(noList,projectLawsInventoryPlatFormList); + = this.projectLawsInventoryEOService.getVerifyComplianceStatistice(projectLawsInventoryEOList); int verifyFlowTaskStatusCount = 0; if(CollectionUtils.isNotEmpty(verifyComplianceMapList)){ for (Map verifyCompliance : verifyComplianceMapList) { @@ -2300,37 +2272,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl projectCertificationInventoryIdList = pciEoList.stream().map(ProjectCertificationInventoryEO::getId).collect(Collectors.toList()); - //认证清单关联的平台件 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,projectCertificationInventoryIdList); - List lawsInventoryPlatformEOList = lawsInventoryPlatformEOService.list(wrapper); - List projectCertificationInventoryEOList = new ArrayList<>(); - List yesList = new ArrayList<>(); - List noList = new ArrayList<>(); - if(ObjectUtils.isNotEmpty(lawsInventoryPlatformEOList)){ - List idList = lawsInventoryPlatformEOList.stream() - .map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList()); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(ProjectCertificationInventoryEO::getId,idList); - projectCertificationInventoryEOList = projectCertificationInventoryEOService.list(queryWrapper); - for (ProjectCertificationInventoryEO certificationInventoryEO : pciEoList) { - List collect = lawsInventoryPlatformEOList.stream() - .filter(e -> e.getLawsInventoryId().equals(certificationInventoryEO.getId())) - .collect(Collectors.toList()); - if(ObjectUtils.isNotEmpty(collect)){ - yesList.add(certificationInventoryEO); - }else{ - noList.add(certificationInventoryEO); - } - } - } - if(ObjectUtils.isEmpty(noList)){ - noList = pciEoList; - } + //认证清单绑定平台件,需要特殊处理 + pciEoList = getProjectCertificationInventoryEOS(pciEoList); // 认证清单-任务确认统计 List> rzTaskToConfirmMapList = - this.projectCertificationInventoryEOService.getTaskToConfirmStatistics(noList,projectCertificationInventoryEOList); + this.projectCertificationInventoryEOService.getTaskToConfirmStatistics(pciEoList); int taskAffirmStatusCount = 0; if(CollectionUtils.isNotEmpty(rzTaskToConfirmMapList)){ for (Map rzTaskToConfirm : rzTaskToConfirmMapList) { @@ -2343,7 +2289,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> prehomoMapList = - this.projectCertificationInventoryEOService.getPrehomoStatistice(noList,projectCertificationInventoryEOList); + this.projectCertificationInventoryEOService.getPrehomoStatistice(pciEoList); int preHomoCount = 0; if (CollectionUtils.isNotEmpty(prehomoMapList)) { for (Map prehomo : prehomoMapList) {