项目库详情统计-法规清单相关统计代码开发。

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

@@ -255,4 +255,25 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
     Result<?> citeDeliverable(JSONObject json);
 
     Result<?> compulsoryTransfer(JSONObject json);
+
+	/**
+	 * 获取任务确认统计信息
+	 * @param projectLawsInventoryEOList
+	 * @return
+	 */
+    List<Map<String, Object>> getTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList);
+
+	/**
+	 * 获取设计符合性统计信息
+	 * @param projectLawsInventoryEOList
+	 * @return
+	 */
+	List<Map<String, Object>> getDesignComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList);
+
+	/**
+	 * 获取验证符合性统计信息
+	 * @param projectLawsInventoryEOList
+	 * @return
+	 */
+	List<Map<String, Object>> getVerifyComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList);
 }

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

@@ -12280,6 +12280,258 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		return Result.OK("强制转办成功！");
 	}
 
+	@Override
+	public List<Map<String, Object>> getTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+		List<Map<String,Object>> result = new ArrayList<>();
+
+		int notStartedCount = 0;
+		int toConfirmCount = 0;
+		int acceptedCount = 0;
+		int rejectedCount = 0;
+		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
+			// 未发起
+			int designNotStartedCount = (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())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+				);
+				return flag;
+			}).count();
+			int verifyNotStartedCount = (int) projectLawsInventoryEOList.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())
+				);
+				return flag;
+			}).count();
+			notStartedCount = designNotStartedCount + verifyNotStartedCount;
+
+			// 待确认
+			int designToConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+				);
+				return flag;
+			}).count();
+			int verifyToConfirmCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+				);
+				return flag;
+			}).count();
+			toConfirmCount = designToConfirmCount + verifyToConfirmCount;
+
+			// 接受
+			int designAcceptedCount = (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())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+				);
+				return flag;
+			}).count();
+			int verifyAcceptedCount = (int) projectLawsInventoryEOList.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())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+				);
+				return flag;
+			}).count();
+			acceptedCount = designAcceptedCount + verifyAcceptedCount;
+
+			// 拒绝
+			int designRejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
+				);
+				return flag;
+			}).count();
+			int verifyRejectedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
+				);
+				return flag;
+			}).count();
+			rejectedCount = designRejectedCount + verifyRejectedCount;
+		}
+
+		Map<String,Object> notStartedMap = new HashMap<>();
+		Map<String,Object> toConfirmMap = new HashMap<>();
+		Map<String,Object> acceptedMap = new HashMap<>();
+		Map<String,Object> rejectedMap = new HashMap<>();
+
+		notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue());
+		notStartedMap.put("taskAffirmStatusCount",notStartedCount);
+
+		toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		toConfirmMap.put("taskAffirmStatusCount",toConfirmCount);
+
+		acceptedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.ACCEPTED.getValue());
+		acceptedMap.put("taskAffirmStatusCount",acceptedCount);
+
+		rejectedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.REJECTED.getValue());
+		rejectedMap.put("taskAffirmStatusCount",rejectedCount);
+
+		result.add(notStartedMap);
+		result.add(toConfirmMap);
+		result.add(acceptedMap);
+		result.add(rejectedMap);
+		return result;
+	}
+
+	@Override
+	public List<Map<String, Object>> getDesignComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+		List<Map<String,Object>> result = new ArrayList<>();
+
+		int notStartedCount = 0;
+		int toConfirmCount = 0;
+		int complianceCount = 0;
+		int nonComplianceCount = 0;
+		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
+			// 未发起
+			notStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
+								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+				);
+				return flag;
+			}).count();
+
+			// 待确认
+			toConfirmCount = (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())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+				);
+				return flag;
+			}).count();
+
+			// 符合
+			complianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue())
+				);
+				return flag;
+			}).count();
+
+			// 不符合
+			nonComplianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+				);
+				return flag;
+			}).count();
+		}
+
+		Map<String,Object> notStartedMap = new HashMap<>();
+		Map<String,Object> toConfirmMap = new HashMap<>();
+		Map<String,Object> acceptedMap = new HashMap<>();
+		Map<String,Object> rejectedMap = new HashMap<>();
+
+		notStartedMap.put("designFlowTaskStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue());
+		notStartedMap.put("designFlowTaskStatusCount",notStartedCount);
+
+		toConfirmMap.put("designFlowTaskStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		toConfirmMap.put("designFlowTaskStatusCount",toConfirmCount);
+
+		acceptedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.CONFORMITY.getValue());
+		acceptedMap.put("designFlowTaskStatusCount",complianceCount);
+
+		rejectedMap.put("designFlowTaskStatus",ComplianceFlowStatusEnum.INCONFORMITY.getValue());
+		rejectedMap.put("designFlowTaskStatusCount",nonComplianceCount);
+
+		result.add(notStartedMap);
+		result.add(toConfirmMap);
+		result.add(acceptedMap);
+		result.add(rejectedMap);
+		return result;
+	}
+
+	@Override
+	public List<Map<String, Object>> getVerifyComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
+		List<Map<String,Object>> result = new ArrayList<>();
+
+		int notStartedCount = 0;
+		int toConfirmCount = 0;
+		int complianceCount = 0;
+		int nonComplianceCount = 0;
+		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
+			// 未发起
+			notStartedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+				);
+				return flag;
+			}).count();
+
+			// 待确认
+			toConfirmCount = (int) projectLawsInventoryEOList.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.TO_TRACK.getValue())
+				);
+				return flag;
+			}).count();
+
+			// 符合
+			complianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.CONFORMITY.getValue())
+				);
+				return flag;
+			}).count();
+
+			// 不符合
+			nonComplianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
+				boolean flag = (
+						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+				);
+				return flag;
+			}).count();
+		}
+
+		Map<String,Object> notStartedMap = new HashMap<>();
+		Map<String,Object> toConfirmMap = new HashMap<>();
+		Map<String,Object> acceptedMap = new HashMap<>();
+		Map<String,Object> rejectedMap = new HashMap<>();
+
+		notStartedMap.put("verifyFlowTaskStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue());
+		notStartedMap.put("verifyFlowTaskStatusCount",notStartedCount);
+
+		toConfirmMap.put("verifyFlowTaskStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		toConfirmMap.put("verifyFlowTaskStatusCount",toConfirmCount);
+
+		acceptedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.CONFORMITY.getValue());
+		acceptedMap.put("verifyFlowTaskStatusCount",complianceCount);
+
+		rejectedMap.put("verifyFlowTaskStatus",ComplianceFlowStatusEnum.INCONFORMITY.getValue());
+		rejectedMap.put("verifyFlowTaskStatusCount",nonComplianceCount);
+
+		result.add(notStartedMap);
+		result.add(toConfirmMap);
+		result.add(acceptedMap);
+		result.add(rejectedMap);
+		return result;
+	}
+
 	/**
 	 * 设计符合性相关待办任务强制转办
 	 * @param projectLibraryId

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

@@ -1499,11 +1499,6 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		listingToConfirmMap.put("listingToConfirmMapList",listingToConfirmMapList);
 		result.put("listingToConfirmMap",listingToConfirmMap);
 
-		//任务确认统计
-		List<Map<String,Object>> taskToConfirmMapList = this.projectLawsInventoryEOMapper.getTaskToConfirmStatistics(id);
-		taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList);
-		result.put("taskToConfirmMap",taskToConfirmMap);
-
 		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
 		lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(id.split(",")));
 		//lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue());
@@ -1512,6 +1507,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		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);
+			taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList);
+			result.put("taskToConfirmMap",taskToConfirmMap);
+
 			//当前项目状态统计   获取一个 最差的结果 统计的数据 就是studio看到的数据。
 			List<Map<String,Object>> currentProjectStatusMapList = new ArrayList<>();
 			CurrentProjectStatusEnum[] values = CurrentProjectStatusEnum.values();
@@ -1539,17 +1539,17 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			result.put("currentProjectStatusMap",currentProjectStatusMap);
 
 			//设计符合性
-			List<Map<String,Object>> designComplianceMapList = this.projectTaskInventoryEOMapper.getDesignComplianceStatistice(projectLawsInventoryIdList);
+			List<Map<String,Object>> designComplianceMapList = this.projectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList);
 			designComplianceMap.put("designComplianceMapList",designComplianceMapList);
 			result.put("designComplianceMap",designComplianceMap);
 
 			//prehomo确认
-			List<Map<String,Object>> prehomoMapList = this.projectTaskInventoryEOMapper.getPrehomoStatistice(projectLawsInventoryIdList);
+			/*List<Map<String,Object>> prehomoMapList = this.projectTaskInventoryEOMapper.getPrehomoStatistice(projectLawsInventoryIdList);
 			prehomoMap.put("prehomoMapList",prehomoMapList);
-			result.put("prehomoMap",prehomoMap);
+			result.put("prehomoMap",prehomoMap);*/
 
 			//验证符合性
-			List<Map<String,Object>> verifyComplianceMapList = this.projectTaskInventoryEOMapper.getVerifyComplianceStatistice(projectLawsInventoryIdList);
+			List<Map<String,Object>> verifyComplianceMapList = this.projectLawsInventoryEOService.getVerifyComplianceStatistice(projectLawsInventoryEOList);
 			verifyComplianceMap.put("verifyComplianceMapList",verifyComplianceMapList);
 			result.put("verifyComplianceMap",verifyComplianceMap);