车型项目库关联平台件后--统计的数据为平台件的数据

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java

@@ -261,14 +261,16 @@ public interface IProjectCertificationInventoryEOService extends IService<Projec
 	 * @param pciEoList
 	 * @return
 	 */
-    List<Map<String, Object>> getTaskToConfirmStatistics(List<ProjectCertificationInventoryEO> pciEoList);
+    List<Map<String, Object>> getTaskToConfirmStatistics(List<ProjectCertificationInventoryEO> pciEoList,
+														 List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
 
 	/**
 	 * 获取Pre-Homo统计信息
 	 * @param pciEoList
 	 * @return
 	 */
-    List<Map<String, Object>> getPrehomoStatistice(List<ProjectCertificationInventoryEO> pciEoList);
+    List<Map<String, Object>> getPrehomoStatistice(List<ProjectCertificationInventoryEO> pciEoList
+			,List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
 
 	/**
 	 * 获取认证进度统计信息 全部

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java

@@ -271,28 +271,32 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
 	 * @param projectLawsInventoryEOList
 	 * @return
 	 */
-	List<Map<String, Object>> getDesignTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList);
+	List<Map<String, Object>> getDesignTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList,
+															   List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList);
 
 	/**
 	 * 验证任务确认
 	 * @param projectLawsInventoryEOList
 	 * @return
 	 */
-	List<Map<String, Object>> getVerifyTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList);
+	List<Map<String, Object>> getVerifyTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList,
+															   List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList);
 
 	/**
 	 * 获取设计符合性统计信息
 	 * @param projectLawsInventoryEOList
 	 * @return
 	 */
-	List<Map<String, Object>> getDesignComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList);
+	List<Map<String, Object>> getDesignComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList,
+															List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList);
 
 	/**
 	 * 获取验证符合性统计信息
 	 * @param projectLawsInventoryEOList
 	 * @return
 	 */
-	List<Map<String, Object>> getVerifyComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList);
+	List<Map<String, Object>> getVerifyComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList,
+															List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList);
 
 	List<Map<String,Object>> queryNotComplianList(Map<String, Object> params);
 

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<Proj
 	}
 
 	@Override
-	public List<Map<String, Object>> getTaskToConfirmStatistics(List<ProjectCertificationInventoryEO> pciEoList) {
+	public List<Map<String, Object>> getTaskToConfirmStatistics(List<ProjectCertificationInventoryEO> pciEoList,
+																List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList) {
 		List<Map<String,Object>> result = new ArrayList<>();
 
 		int listToBeReleasedCount = 0;//清单待发布
@@ -3305,7 +3305,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		int taskToBeConfirmedCount = 0;//任务待确认
 		int acceptedCount = 0;//责任人接受
 		int rejectedCount = 0;//责任人拒绝
-
+		//车型项目库数据统计-------------------------------------------------------------------------------
 		if(CollectionUtils.isNotEmpty(pciEoList)){
 			// 清单待发布
 			listToBeReleasedCount = (int) pciEoList.stream().filter(pciEo -> {
@@ -3347,6 +3347,40 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				return flag;
 			}).count();
 		}
+		//平台件数据统计-------------------------------------------------------------------------------
+		if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){
+			// 任务待发起
+			taskToBeInitiatedCount += (int) projectCertificationInventoryEOList.stream().filter(pciEo -> {
+				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<String,Object> listToBeReleasedMap = new HashMap<>();
 		Map<String,Object> taskToBeInitiatedMap = new HashMap<>();
@@ -3378,7 +3412,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	}
 
 	@Override
-	public List<Map<String, Object>> getPrehomoStatistice(List<ProjectCertificationInventoryEO> pciEoList) {
+	public List<Map<String, Object>> getPrehomoStatistice(List<ProjectCertificationInventoryEO> pciEoList,
+														  List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList) {
 		List<Map<String,Object>> result = new ArrayList<>();
 
 		int taskToBeConfirmedCount = 0;//任务待确认
@@ -3387,6 +3422,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		int reviewAndPassCount = 0;//审查通过
 		int reviewAndReturnCount = 0;//审查退回
 
+		//车型项目库数据统计------------------------------------------------------------------------------
 		if(CollectionUtils.isNotEmpty(pciEoList)){
 			// 任务待确认
 			taskToBeConfirmedCount = (int) pciEoList.stream().filter(pciEo -> {
@@ -3428,6 +3464,48 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				return flag;
 			}).count();
 		}
+		//平台件数据统计------------------------------------------------------------------------------
+		if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){
+			// 任务待确认
+			taskToBeConfirmedCount += (int) projectCertificationInventoryEOList.stream().filter(pciEo -> {
+				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<String,Object> taskToBeConfirmedMap = new HashMap<>();
 		Map<String,Object> resultsToBeSubmittedMap = new HashMap<>();
 		Map<String,Object> resultsToBeReviewedMap = new HashMap<>();

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<ProjectLawsIn
 	 * @return
 	 */
 	@Override
-	public List<Map<String, Object>> getDesignTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+	public List<Map<String, Object>> getDesignTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList,
+																	  List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList) {
 		List<Map<String,Object>> result = new ArrayList<>();
 
 		int listToBeReleasedCount = 0;//清单待发布
@@ -10307,9 +10308,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		int taskToBeConfirmedCount = 0;//任务待确认
 		int acceptedCount = 0;//责任人接收
 		int rejectedCount = 0;//责任人拒绝
+		//如果法规清单关联的平台件，则此时统计的（原法规清单的数据以及平台件的数据）
+		//车型项目库法规统计数据统计-----------------------------------------------
 		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
 			// 清单待发布
-			listToBeReleasedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+			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<ProjectLawsIn
 			}).count();
 
 			// 任务待发起
-			taskToBeInitiatedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+			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<ProjectLawsIn
 			}).count();
 
 			// 任务待确认
-			taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+			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<ProjectLawsIn
 			}).count();
 
 			// 责任人接收
-			acceptedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+			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<ProjectLawsIn
 			}).count();
 
 			// 责任人拒绝
-			rejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+			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<ProjectLawsIn
 	 * @return
 	 */
 	@Override
-	public List<Map<String, Object>> getVerifyTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+	public List<Map<String, Object>> getVerifyTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList,
+																	  List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList) {
 		List<Map<String,Object>> result = new ArrayList<>();
 
 		int listToBeReleasedCount = 0;//清单待发布
@@ -10397,6 +10439,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		int taskToBeConfirmedCount = 0;//任务待确认
 		int acceptedCount = 0;//责任人接收
 		int rejectedCount = 0;//责任人拒绝
+		//车型项目库法规统计数据统计-----------------------------------------------
 		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
 			// 清单待发布
 			listToBeReleasedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
@@ -10443,6 +10486,44 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).count();
 		}
+		//平台件数据统计-----------------------------------------------
+		if(CollectionUtils.isNotEmpty(projectLawsInventoryPlatFormList)){
+			// 任务待发起
+			taskToBeInitiatedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
+				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<String,Object> listToBeReleasedMap = new HashMap<>();//清单待发布
 		Map<String,Object> taskToBeInitiatedMap = new HashMap<>();//任务待发起
@@ -10474,7 +10555,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	}
 
 	@Override
-	public List<Map<String, Object>> getDesignComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+	public List<Map<String, Object>> getDesignComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList,
+																   List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList) {
 		List<Map<String,Object>> result = new ArrayList<>();
 		int taskToBeConfirmedCount = 0;//任务待确认
 		int resultsToBeSubmittedCount = 0;//结果待提交
@@ -10482,6 +10564,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		int complianceCount = 0;//符合
 		int nonComplianceCount = 0;//不符合
 		int toBeTrackedCount = 0;//待追踪
+		//车型项目库法规清单数据统计------------------------------------------------------------------------
 		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
 			// 任务待确认
 			taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
@@ -10534,6 +10617,59 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).count();
 		}
+		//平台件数据统计------------------------------------------------------------------------
+		if(CollectionUtils.isNotEmpty(projectLawsInventoryPlatFormList)){
+			// 任务待确认
+			taskToBeConfirmedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
+				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<String,Object> taskToBeConfirmedMap = new HashMap<>();
 		Map<String,Object> resultsToBeSubmittedMap = new HashMap<>();
@@ -10570,7 +10706,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	}
 
 	@Override
-	public List<Map<String, Object>> getVerifyComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+	public List<Map<String, Object>> getVerifyComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList,
+																   List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList) {
 		List<Map<String,Object>> result = new ArrayList<>();
 		int taskToBeConfirmedCount = 0;//任务待确认
 		int resultsToBeSubmittedCount = 0;//结果待提交
@@ -10578,6 +10715,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		int complianceCount = 0;//符合
 		int nonComplianceCount = 0;//不符合
 		int toBeTrackedCount = 0;//待追踪
+		//平车型项目库数据统计-----------------------------------------------------------------------------------------
 		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
 			// 任务待确认
 			taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
@@ -10630,6 +10768,59 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).count();
 		}
+		//平台件数据统计-----------------------------------------------------------------------------------------
+		if(CollectionUtils.isNotEmpty(projectLawsInventoryPlatFormList)){
+			// 任务待确认
+			taskToBeConfirmedCount += (int) projectLawsInventoryPlatFormList.stream().filter(pliEo -> {
+				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<String,Object> taskToBeConfirmedMap = new HashMap<>();
 		Map<String,Object> resultsToBeSubmittedMap = new HashMap<>();

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<ProjectLibraryBas
 		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
 		lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(id.split(",")));
 		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
-		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
-			List<String> projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
 
-			//任务确认统计
+		//法规符合性管理统计（统计的是法规清单）------------------------------------------------------------------------------------------------------------------------------
-//			List<Map<String,Object>> taskToConfirmMapList = this.projectLawsInventoryEOService.getTaskToConfirmStatistics(projectLawsInventoryEOList);
+		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
-//			int taskAffirmStatusCount = 0;
+			List<String> projectLawsInventoryIdList = projectLawsInventoryEOList.stream()
-//			if(CollectionUtils.isNotEmpty(taskToConfirmMapList)){
+					.distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
-//				//taskAffirmStatusCount
+			//法规清单关联的所有平台件
-//				for (Map<String, Object> taskToConfirm : taskToConfirmMapList) {
+			LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
-//					taskAffirmStatusCount += (int) taskToConfirm.get("taskAffirmStatusCount");
+			wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,projectLawsInventoryIdList);
-//				}
+			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = lawsInventoryPlatformEOService.list(wrapper);
-//			}
+			//区分哪些法规清单关联了平台件，哪些法规清单没有关联平台件
-//			taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList);
+			List<ProjectLawsInventoryEO> yesList = new ArrayList<>();
-//			taskToConfirmMap.put("count",taskAffirmStatusCount);
+			List<ProjectLawsInventoryEO> noList = new ArrayList<>();
-//			result.put("taskToConfirmMap",taskToConfirmMap);
+			List<ProjectLawsInventoryEO> projectLawsInventoryPlatFormList = new ArrayList<>();
+			if(ObjectUtils.isNotEmpty(lawsInventoryPlatformEOList)){
+				//所关联平台件的法规清单id
+				List<String> idList = lawsInventoryPlatformEOList.stream()
+						.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList());
+				LambdaQueryWrapper<ProjectLawsInventoryEO> queryWrapper = new LambdaQueryWrapper<>();
+				queryWrapper.in(ProjectLawsInventoryEO::getId,idList);
+				projectLawsInventoryPlatFormList = projectLawsInventoryEOMapper.selectList(queryWrapper);
+				for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) {
+					List<LawsInventoryPlatformEO> 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<Map<String,Object>> designTaskToConfirmMapList = this.projectLawsInventoryEOService.getDesignTaskToConfirmStatistics(projectLawsInventoryEOList);
+			List<Map<String,Object>> designTaskToConfirmMapList =
+					this.projectLawsInventoryEOService.getDesignTaskToConfirmStatistics(noList,projectLawsInventoryPlatFormList);
+
 			int designTaskAffirmStatusCount = 0;
 			if(CollectionUtils.isNotEmpty(designTaskToConfirmMapList)){
 				//taskAffirmStatusCount
@@ -2228,7 +2248,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			result.put("designTaskToConfirmMap",designTaskToConfirmMap);
 
 			//验证任务确认
-			List<Map<String,Object>> verifyTaskToConfirmMapList = this.projectLawsInventoryEOService.getVerifyTaskToConfirmStatistics(projectLawsInventoryEOList);
+			List<Map<String,Object>> verifyTaskToConfirmMapList
+					= this.projectLawsInventoryEOService.getVerifyTaskToConfirmStatistics(noList,projectLawsInventoryPlatFormList);
 			int verifyTaskAffirmStatusCount = 0;
 			if(CollectionUtils.isNotEmpty(verifyTaskToConfirmMapList)){
 				//taskAffirmStatusCount
@@ -2241,7 +2262,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			result.put("verifyTaskToConfirmMap",verifyTaskToConfirmMap);
 
 			//设计符合性
-			List<Map<String,Object>> designComplianceMapList = this.projectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList);
+			List<Map<String,Object>> designComplianceMapList
+					= this.projectLawsInventoryEOService.getDesignComplianceStatistice(noList,projectLawsInventoryPlatFormList);
 			int designFlowTaskStatusCount = 0;
 			if(CollectionUtils.isNotEmpty(designComplianceMapList)){
 				for (Map<String, Object> designCompliance : designComplianceMapList) {
@@ -2253,7 +2275,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			result.put("designComplianceMap",designComplianceMap);
 
 			//验证符合性
-			List<Map<String,Object>> verifyComplianceMapList = this.projectLawsInventoryEOService.getVerifyComplianceStatistice(projectLawsInventoryEOList);
+			List<Map<String,Object>> verifyComplianceMapList
+					= this.projectLawsInventoryEOService.getVerifyComplianceStatistice(noList,projectLawsInventoryPlatFormList);
 			int verifyFlowTaskStatusCount = 0;
 			if(CollectionUtils.isNotEmpty(verifyComplianceMapList)){
 				for (Map<String, Object> verifyCompliance : verifyComplianceMapList) {
@@ -2274,9 +2297,40 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			}
 			return flag;
 		}).distinct().collect(Collectors.toList());
+
+		//认证活动管理统计（统计的是认证清单）------------------------------------------------------------------------------------------------------------------------------
 		if(CollectionUtils.isNotEmpty(pciEoList)){
+			List<String> projectCertificationInventoryIdList = pciEoList.stream().map(ProjectCertificationInventoryEO::getId).collect(Collectors.toList());
+			//认证清单关联的平台件
+			LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+			wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,projectCertificationInventoryIdList);
+			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = lawsInventoryPlatformEOService.list(wrapper);
+			List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = new ArrayList<>();
+			List<ProjectCertificationInventoryEO> yesList = new ArrayList<>();
+			List<ProjectCertificationInventoryEO> noList = new ArrayList<>();
+			if(ObjectUtils.isNotEmpty(lawsInventoryPlatformEOList)){
+				List<String> idList = lawsInventoryPlatformEOList.stream()
+						.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList());
+				LambdaQueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new LambdaQueryWrapper<>();
+				queryWrapper.in(ProjectCertificationInventoryEO::getId,idList);
+				projectCertificationInventoryEOList = projectCertificationInventoryEOService.list(queryWrapper);
+				for (ProjectCertificationInventoryEO certificationInventoryEO : pciEoList) {
+					List<LawsInventoryPlatformEO> 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<Map<String,Object>> rzTaskToConfirmMapList = this.projectCertificationInventoryEOService.getTaskToConfirmStatistics(pciEoList);
+			List<Map<String,Object>> rzTaskToConfirmMapList =
+					this.projectCertificationInventoryEOService.getTaskToConfirmStatistics(noList,projectCertificationInventoryEOList);
 			int taskAffirmStatusCount = 0;
 			if(CollectionUtils.isNotEmpty(rzTaskToConfirmMapList)){
 				for (Map<String, Object> rzTaskToConfirm : rzTaskToConfirmMapList) {
@@ -2288,7 +2342,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			result.put("rzTaskToConfirmMap",rzTaskToConfirmMap);
 
 			// Pre-Homo 统计
-			List<Map<String,Object>> prehomoMapList = this.projectCertificationInventoryEOService.getPrehomoStatistice(pciEoList);
+			List<Map<String,Object>> prehomoMapList =
+					this.projectCertificationInventoryEOService.getPrehomoStatistice(noList,projectCertificationInventoryEOList);
 			int preHomoCount = 0;
 			if (CollectionUtils.isNotEmpty(prehomoMapList)) {
 				for (Map<String, Object> prehomo : prehomoMapList) {
@@ -2299,6 +2354,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			prehomoMap.put("count",preHomoCount);
 			result.put("prehomoMap",prehomoMap);
 
+
+
 			// 认证进度 统计
 			List<Map<String,Object>> allMapList = this.projectCertificationInventoryEOService.getAllCertificationProgressStatistics(pciEoList);
 			List<Map<String,Object>> carMapList = this.projectCertificationInventoryEOService.getCarCertificationProgressStatistics(pciEoList);