WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UAT198条修改，项目库详情-统计-计算总数。

Browse Source
This commit is contained in:
wangzhijiang
2023-05-09 11:48:32 +08:00
parent fff039ea7c
commit 8372532293
1 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+60 -2
View File
@@ -1518,7 +1518,15 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
//任务确认统计
List<Map<String,Object>> taskToConfirmMapList = this.projectLawsInventoryEOService.getTaskToConfirmStatistics(projectLawsInventoryEOList);
int taskAffirmStatusCount = 0;
if(CollectionUtils.isNotEmpty(taskToConfirmMapList)){
//taskAffirmStatusCount
for (Map<String, Object> taskToConfirm : taskToConfirmMapList) {
taskAffirmStatusCount += (int) taskToConfirm.get("taskAffirmStatusCount");
}
}
taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList);
taskToConfirmMap.put("count",taskAffirmStatusCount);
result.put("taskToConfirmMap",taskToConfirmMap);
//当前项目状态统计 获取一个 最差的结果 统计的数据 就是studio看到的数据。
@@ -1549,12 +1557,26 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
//设计符合性
List<Map<String,Object>> designComplianceMapList = this.projectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList);
int designFlowTaskStatusCount = 0;
if(CollectionUtils.isNotEmpty(designComplianceMapList)){
for (Map<String, Object> designCompliance : designComplianceMapList) {
designFlowTaskStatusCount += (int) designCompliance.get("designFlowTaskStatusCount");
}
}
designComplianceMap.put("designComplianceMapList",designComplianceMapList);
designComplianceMap.put("count",designFlowTaskStatusCount);
result.put("designComplianceMap",designComplianceMap);
//验证符合性
List<Map<String,Object>> verifyComplianceMapList = this.projectLawsInventoryEOService.getVerifyComplianceStatistice(projectLawsInventoryEOList);
int verifyFlowTaskStatusCount = 0;
if(CollectionUtils.isNotEmpty(verifyComplianceMapList)){
for (Map<String, Object> verifyCompliance : verifyComplianceMapList) {
verifyFlowTaskStatusCount += (int) verifyCompliance.get("verifyFlowTaskStatusCount");
}
}
verifyComplianceMap.put("verifyComplianceMapList",verifyComplianceMapList);
verifyComplianceMap.put("count",verifyFlowTaskStatusCount);
result.put("verifyComplianceMap",verifyComplianceMap);
//认证进度统计
@@ -1594,12 +1616,26 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
if(CollectionUtils.isNotEmpty(pciEoList)){
// 认证清单-任务确认统计
List<Map<String,Object>> rzTaskToConfirmMapList = this.projectCertificationInventoryEOService.getTaskToConfirmStatistics(pciEoList);
int taskAffirmStatusCount = 0;
if(CollectionUtils.isNotEmpty(rzTaskToConfirmMapList)){
for (Map<String, Object> rzTaskToConfirm : rzTaskToConfirmMapList) {
taskAffirmStatusCount += (int) rzTaskToConfirm.get("taskAffirmStatusCount");
}
}
rzTaskToConfirmMap.put("rzTaskToConfirmMapList",rzTaskToConfirmMapList);
rzTaskToConfirmMap.put("count",taskAffirmStatusCount);
result.put("rzTaskToConfirmMap",rzTaskToConfirmMap);
// Pre-Homo 统计
List<Map<String,Object>> prehomoMapList = this.projectCertificationInventoryEOService.getPrehomoStatistice(pciEoList);
int preHomoCount = 0;
if (CollectionUtils.isNotEmpty(prehomoMapList)) {
for (Map<String, Object> prehomo : prehomoMapList) {
preHomoCount += (int) prehomo.get("taskAffirmStatusCount");
}
}
prehomoMap.put("prehomoMapList",prehomoMapList);
prehomoMap.put("count",preHomoCount);
result.put("prehomoMap",prehomoMap);
// 认证进度 统计
@@ -1609,6 +1645,28 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
certificationProgressMap.put("allMapList",allMapList);// 全部
certificationProgressMap.put("carMapList",carMapList);// 整车
certificationProgressMap.put("partMapList",partMapList);// 零部件
int allCount = 0;
if(CollectionUtils.isNotEmpty(allMapList)){
for (Map<String, Object> all : allMapList) {
allCount += (int) all.get("certificationProgressCount");
}
}
int carCount = 0;
if(CollectionUtils.isNotEmpty(carMapList)){
for (Map<String, Object> car : carMapList) {
carCount += (int) car.get("certificationProgressCount");
}
}
int partCount = 0;
if(CollectionUtils.isNotEmpty(partMapList)){
for (Map<String, Object> part : partMapList) {
partCount += (int) part.get("certificationProgressCount");
}
}
certificationProgressMap.put("allCount",allCount);// 全部
certificationProgressMap.put("carCount",carCount);// 整车
certificationProgressMap.put("partCount",partCount);// 零部件
result.put("certificationProgressMap",certificationProgressMap);
}
@@ -1990,7 +2048,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
String sheetName = "";
String title = "";
if (StringUtils.equals(cut,CutEnum.CN.getValue())) {
title = "责任领域,数量,占比";
title = "责任领域,数量,责任领域内占比";
if(StringUtils.equals(OperatorTypeEnum.QUERY_FG_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
sheetName = "法规任务确认";
}else if(StringUtils.equals(OperatorTypeEnum.QUERY_DESIGN_STATISTICS.getValue(),operatorType)){
@@ -2024,7 +2082,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
sheetName = "认证进度";
}*/
}else if (StringUtils.equals(cut,CutEnum.EN.getValue())) {
title = "Responsible Field,Quantity,Proportion";
title = "Responsible Field,Quantity,Proportion within the area of responsibility";
if(StringUtils.equals(OperatorTypeEnum.QUERY_FG_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
sheetName = "Regulation Task Confirmation";
}else if(StringUtils.equals(OperatorTypeEnum.QUERY_DESIGN_STATISTICS.getValue(),operatorType)){