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 f205301bb..ed36a3a1a 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,14 +261,16 @@ public interface IProjectCertificationInventoryEOService extends IService> getTaskToConfirmStatistics(List pciEoList); + List> getTaskToConfirmStatistics(List pciEoList, + List projectCertificationInventoryEOList); /** * 获取Pre-Homo统计信息 * @param pciEoList * @return */ - List> getPrehomoStatistice(List pciEoList); + List> getPrehomoStatistice(List pciEoList + ,List projectCertificationInventoryEOList); /** * 获取认证进度统计信息 全部 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 17828c496..0c6997549 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,28 +271,32 @@ public interface IProjectLawsInventoryEOService extends IService> getDesignTaskToConfirmStatistics(List projectLawsInventoryEOList); + List> getDesignTaskToConfirmStatistics(List projectLawsInventoryEOList, + List projectLawsInventoryPlatFormList); /** * 验证任务确认 * @param projectLawsInventoryEOList * @return */ - List> getVerifyTaskToConfirmStatistics(List projectLawsInventoryEOList); + List> getVerifyTaskToConfirmStatistics(List projectLawsInventoryEOList, + List projectLawsInventoryPlatFormList); /** * 获取设计符合性统计信息 * @param projectLawsInventoryEOList * @return */ - List> getDesignComplianceStatistice(List projectLawsInventoryEOList); + List> getDesignComplianceStatistice(List projectLawsInventoryEOList, + List projectLawsInventoryPlatFormList); /** * 获取验证符合性统计信息 * @param projectLawsInventoryEOList * @return */ - List> getVerifyComplianceStatistice(List projectLawsInventoryEOList); + List> getVerifyComplianceStatistice(List projectLawsInventoryEOList, + List projectLawsInventoryPlatFormList); 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 d6e667f79..f65235c85 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 @@ -38,7 +38,6 @@ import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginner import com.jero.modules.project.entity.ProjectCertificationInventoryEO; import com.jero.modules.project.entity.ProjectCertificationInventoryEOEn; import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO; -import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectLibraryRoleRelEO; import com.jero.modules.project.entity.ProjectRelatedPersonnel; @@ -3297,7 +3296,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl> getTaskToConfirmStatistics(List pciEoList) { + public List> getTaskToConfirmStatistics(List pciEoList, + List projectCertificationInventoryEOList) { List> result = new ArrayList<>(); int listToBeReleasedCount = 0;//清单待发布 @@ -3305,7 +3305,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl { @@ -3347,6 +3347,40 @@ 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<>(); @@ -3378,7 +3412,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl> getPrehomoStatistice(List pciEoList) { + public List> getPrehomoStatistice(List pciEoList, + List projectCertificationInventoryEOList) { List> result = new ArrayList<>(); int taskToBeConfirmedCount = 0;//任务待确认 @@ -3387,6 +3422,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl { @@ -3428,6 +3464,48 @@ 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 d5d2ca6fe..d2d6d8178 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,7 +10299,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> getDesignTaskToConfirmStatistics(List projectLawsInventoryEOList) { + public List> getDesignTaskToConfirmStatistics(List projectLawsInventoryEOList, + List projectLawsInventoryPlatFormList) { List> result = new ArrayList<>(); int listToBeReleasedCount = 0;//清单待发布 @@ -10307,9 +10308,11 @@ 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()) @@ -10318,7 +10321,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { + taskToBeInitiatedCount += (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) ); @@ -10326,7 +10329,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { + taskToBeConfirmedCount += (int) projectLawsInventoryEOList.stream().filter(pliEo -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) ); @@ -10334,7 +10337,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()) @@ -10346,7 +10349,45 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { + rejectedCount += (int) projectLawsInventoryEOList.stream().filter(pliEo -> { + 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 -> { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) ); @@ -10389,7 +10430,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> getVerifyTaskToConfirmStatistics(List projectLawsInventoryEOList) { + public List> getVerifyTaskToConfirmStatistics(List projectLawsInventoryEOList, + List projectLawsInventoryPlatFormList) { List> result = new ArrayList<>(); int listToBeReleasedCount = 0;//清单待发布 @@ -10397,6 +10439,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { @@ -10443,6 +10486,44 @@ 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<>();//任务待发起 @@ -10474,7 +10555,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> getDesignComplianceStatistice(List projectLawsInventoryEOList) { + public List> getDesignComplianceStatistice(List projectLawsInventoryEOList, + List projectLawsInventoryPlatFormList) { List> result = new ArrayList<>(); int taskToBeConfirmedCount = 0;//任务待确认 int resultsToBeSubmittedCount = 0;//结果待提交 @@ -10482,6 +10564,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { @@ -10534,6 +10617,59 @@ 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<>(); @@ -10570,7 +10706,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> getVerifyComplianceStatistice(List projectLawsInventoryEOList) { + public List> getVerifyComplianceStatistice(List projectLawsInventoryEOList, + List projectLawsInventoryPlatFormList) { List> result = new ArrayList<>(); int taskToBeConfirmedCount = 0;//任务待确认 int resultsToBeSubmittedCount = 0;//结果待提交 @@ -10578,6 +10715,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { @@ -10630,6 +10768,59 @@ 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 553e17fa4..f0516703a 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 @@ -2199,23 +2199,43 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl lawsInventoryEOQueryWrapper = new QueryWrapper<>(); lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(id.split(","))); List projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper); - if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ - List projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList()); - //任务确认统计 -// List> taskToConfirmMapList = this.projectLawsInventoryEOService.getTaskToConfirmStatistics(projectLawsInventoryEOList); -// int taskAffirmStatusCount = 0; -// if(CollectionUtils.isNotEmpty(taskToConfirmMapList)){ -// //taskAffirmStatusCount -// for (Map taskToConfirm : taskToConfirmMapList) { -// taskAffirmStatusCount += (int) taskToConfirm.get("taskAffirmStatusCount"); -// } -// } -// taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList); -// taskToConfirmMap.put("count",taskAffirmStatusCount); -// result.put("taskToConfirmMap",taskToConfirmMap); + //法规符合性管理统计(统计的是法规清单)------------------------------------------------------------------------------------------------------------------------------ + if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ + List 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; + } //设计任务确认 - List> designTaskToConfirmMapList = this.projectLawsInventoryEOService.getDesignTaskToConfirmStatistics(projectLawsInventoryEOList); + List> designTaskToConfirmMapList = + this.projectLawsInventoryEOService.getDesignTaskToConfirmStatistics(noList,projectLawsInventoryPlatFormList); + int designTaskAffirmStatusCount = 0; if(CollectionUtils.isNotEmpty(designTaskToConfirmMapList)){ //taskAffirmStatusCount @@ -2228,7 +2248,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> verifyTaskToConfirmMapList = this.projectLawsInventoryEOService.getVerifyTaskToConfirmStatistics(projectLawsInventoryEOList); + List> verifyTaskToConfirmMapList + = this.projectLawsInventoryEOService.getVerifyTaskToConfirmStatistics(noList,projectLawsInventoryPlatFormList); int verifyTaskAffirmStatusCount = 0; if(CollectionUtils.isNotEmpty(verifyTaskToConfirmMapList)){ //taskAffirmStatusCount @@ -2241,7 +2262,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> designComplianceMapList = this.projectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList); + List> designComplianceMapList + = this.projectLawsInventoryEOService.getDesignComplianceStatistice(noList,projectLawsInventoryPlatFormList); int designFlowTaskStatusCount = 0; if(CollectionUtils.isNotEmpty(designComplianceMapList)){ for (Map designCompliance : designComplianceMapList) { @@ -2253,7 +2275,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> verifyComplianceMapList = this.projectLawsInventoryEOService.getVerifyComplianceStatistice(projectLawsInventoryEOList); + List> verifyComplianceMapList + = this.projectLawsInventoryEOService.getVerifyComplianceStatistice(noList,projectLawsInventoryPlatFormList); int verifyFlowTaskStatusCount = 0; if(CollectionUtils.isNotEmpty(verifyComplianceMapList)){ for (Map verifyCompliance : verifyComplianceMapList) { @@ -2274,9 +2297,40 @@ 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.getPlatformLawsInventoryId().equals(certificationInventoryEO.getId())) + .collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(collect)){ + yesList.add(certificationInventoryEO); + }else{ + noList.add(certificationInventoryEO); + } + } + } + if(ObjectUtils.isEmpty(noList)){ + noList = pciEoList; + } // 认证清单-任务确认统计 - List> rzTaskToConfirmMapList = this.projectCertificationInventoryEOService.getTaskToConfirmStatistics(pciEoList); + List> rzTaskToConfirmMapList = + this.projectCertificationInventoryEOService.getTaskToConfirmStatistics(noList,projectCertificationInventoryEOList); int taskAffirmStatusCount = 0; if(CollectionUtils.isNotEmpty(rzTaskToConfirmMapList)){ for (Map rzTaskToConfirm : rzTaskToConfirmMapList) { @@ -2288,7 +2342,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> prehomoMapList = this.projectCertificationInventoryEOService.getPrehomoStatistice(pciEoList); + List> prehomoMapList = + this.projectCertificationInventoryEOService.getPrehomoStatistice(noList,projectCertificationInventoryEOList); int preHomoCount = 0; if (CollectionUtils.isNotEmpty(prehomoMapList)) { for (Map prehomo : prehomoMapList) { @@ -2299,6 +2354,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> allMapList = this.projectCertificationInventoryEOService.getAllCertificationProgressStatistics(pciEoList); List> carMapList = this.projectCertificationInventoryEOService.getCarCertificationProgressStatistics(pciEoList);