版本统计

项目当前状态,
交付物状态--清单确认进度,任务确认进度

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml

@@ -55,7 +55,10 @@
         from
             project_laws_inventory
         where
-            project_library_id = #{projectLibraryId}
+            project_library_id in
+            <foreach collection="projectLibraryId.split(',')" index="index" separator="," open="(" close=")" item="item">
+                #{item}
+            </foreach>
         group by inventory_affirm_status
     </select>
 
@@ -67,7 +70,10 @@
         from
             project_laws_inventory
         where
-            project_library_id = #{projectLibraryId}
+            project_library_id in
+            <foreach collection="projectLibraryId.split(',')" index="index" separator="," open="(" close=")" item="item">
+                #{item}
+            </foreach>
         group by task_affirm_status
     </select>
 

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

@@ -699,7 +699,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		result.put("taskToConfirmMap",taskToConfirmMap);
 
 		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
-		lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,id);
+		lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(id.split(",")));
 		//lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue());
 		//lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue());
 		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
@@ -780,6 +780,117 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 		return result;
 	}
+//	@Override
+//	public Map<String, Object> getProjectDetailsStatistics(String id) {
+//		Map<String,Object> result = new HashMap<>();
+//
+//		//当前项目状态
+//		Map<String,Object> currentProjectStatusMap = new HashMap<>();
+//		//清单确认
+//		Map<String,Object> listingToConfirmMap = new HashMap<>();
+//		//任务确认
+//		Map<String,Object> taskToConfirmMap = new HashMap<>();
+//		//设计符合性
+//		Map<String,Object> designComplianceMap = new HashMap<>();
+//		//prehomo确认
+//		Map<String,Object> prehomoMap = new HashMap<>();
+//		//验证符合性
+//		Map<String,Object> verifyComplianceMap = new HashMap<>();
+//		//认证进度
+//		Map<String,Object> certificationProgressMap = new HashMap<>();
+//
+//		//清单确认统计
+//		List<Map<String,Object>> listingToConfirmMapList = this.projectLawsInventoryEOMapper.getlistingToConfirmStatistics(id);
+//		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().eq(ProjectLawsInventoryEO::getProjectLibraryId,id);
+//		//lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue());
+//		//lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue());
+//		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
+//		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
+//			List<String> projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
+//
+//			//当前项目状态统计   获取一个 最差的结果 统计的数据 就是studio看到的数据。
+//			List<Map<String,Object>> currentProjectStatusMapList = new ArrayList<>();
+//			CurrentProjectStatusEnum[] values = CurrentProjectStatusEnum.values();
+//			for (CurrentProjectStatusEnum value : values) {
+//				Map<String,Object> map = new HashMap<>();
+//				map.put("color",value.getValue());
+//				currentProjectStatusMapList.add(map);
+//			}
+//			int currentProjectStatusTotal;
+//			List<ConditionAssessmentEO> projectStatusAssessList = this.conditionAssessmentEOService.getProjectStatusAssessList(projectLawsInventoryIdList);
+//
+//			for (Map<String, Object> map : currentProjectStatusMapList) {
+//				List<ConditionAssessmentEO> collect = projectStatusAssessList.stream().filter(
+//						projectStatusAssess -> StringUtils.equals(projectStatusAssess.getConditionAssessment(),map.get("color").toString())
+//				).collect(Collectors.toList());
+//				map.put("conditionAssessmentCount",collect.size());
+//			}
+//
+//			currentProjectStatusTotal = currentProjectStatusMapList.stream().filter(
+//					currentProjectStatus -> Integer.parseInt(currentProjectStatus.get("conditionAssessmentCount").toString()) != 0
+//			).mapToInt(currentProjectStatus -> Integer.parseInt(currentProjectStatus.get("conditionAssessmentCount").toString())).sum();
+//
+//			currentProjectStatusMap.put("currentProjectStatusMapList",currentProjectStatusMapList);
+//			currentProjectStatusMap.put("currentProjectStatusTotal",currentProjectStatusTotal);
+//			result.put("currentProjectStatusMap",currentProjectStatusMap);
+//
+//			//设计符合性
+//			List<Map<String,Object>> designComplianceMapList = this.projectTaskInventoryEOMapper.getDesignComplianceStatistice(projectLawsInventoryIdList);
+//			designComplianceMap.put("designComplianceMapList",designComplianceMapList);
+//			result.put("designComplianceMap",designComplianceMap);
+//
+//			//prehomo确认
+//			List<Map<String,Object>> prehomoMapList = this.projectTaskInventoryEOMapper.getPrehomoStatistice(projectLawsInventoryIdList);
+//			prehomoMap.put("prehomoMapList",prehomoMapList);
+//			result.put("prehomoMap",prehomoMap);
+//
+//			//验证符合性
+//			List<Map<String,Object>> verifyComplianceMapList = this.projectTaskInventoryEOMapper.getVerifyComplianceStatistice(projectLawsInventoryIdList);
+//			verifyComplianceMap.put("verifyComplianceMapList",verifyComplianceMapList);
+//			result.put("verifyComplianceMap",verifyComplianceMap);
+//
+//			//认证进度统计
+//			int certificationProgressTotal;
+//			List<Map<String,Object>> certificationProgressMapList = this.projectTaskInventoryEOMapper.getCertificationProgressStatistics(projectLawsInventoryIdList);
+//			certificationProgressTotal = certificationProgressMapList.stream().filter(
+//					certificationProgress -> Integer.parseInt(certificationProgress.get("certificationProgressCount").toString()) != 0
+//			).mapToInt(certificationProgress -> Integer.parseInt(certificationProgress.get("certificationProgressCount").toString())).sum();
+//
+//			CertificationProgressEnum[] CertificationProgressEnumValues = CertificationProgressEnum.values();
+//			for (CertificationProgressEnum certificationProgressEnumValue : CertificationProgressEnumValues) {
+//				boolean flag = true;
+//				for (Map<String, Object> map : certificationProgressMapList) {
+//					if(map.get("certificationProgress") != null){
+//						if(StringUtils.equals(certificationProgressEnumValue.getValue(),map.get("certificationProgress").toString())){
+//							flag = false;
+//							break;
+//						}
+//					}
+//				}
+//				if(flag){
+//					Map<String,Object> map = new HashMap<>();
+//					map.put("certificationProgress",certificationProgressEnumValue.getValue());
+//					map.put("certificationProgressCount",0);
+//					certificationProgressMapList.add(map);
+//				}
+//			}
+//
+//			certificationProgressMap.put("certificationProgressTotal",certificationProgressTotal);
+//			certificationProgressMap.put("certificationProgressMapList",certificationProgressMapList);
+//			result.put("certificationProgressMap",certificationProgressMap);
+//		}
+//
+//		return result;
+//	}
 
 	/**
 	 * 项目详情-统计接口-根据领域分组