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

项目状态看板-导出（认证任务确认，Pre-Homo流程，认证进度，参数收集进度）

Browse Source
This commit is contained in:
zhn
2023-10-13 10:14:45 +08:00
parent b4b70564a9
commit 3774b14d25
3 changed files with 37 additions and 32 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/ProjectCertificationInventoryEOServiceImpl.java
+32 -28
View File
@@ -6563,9 +6563,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
double inProgressCount = 0; // 进行中
double testPassedCount = 0; // 实验通过
double testFailedCount = 0; // 实验失败
double notSubmitCount = 0; // 部件报告未上传
double reportSubmitCount = 0; // 部件报告已上传
double storedCount = 0; // 部件报告已入库
// double notSubmitCount = 0; // 部件报告未上传
// double reportSubmitCount = 0; // 部件报告已上传
// double storedCount = 0; // 部件报告已入库
double count = 0;
// 计算百分比
double percentage = 0;
@@ -6585,6 +6585,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
List<ProjectCertificationInventoryEO> inProgressPciEoList = pciEos.stream().filter(data -> {
boolean flag = (
StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.IN_PROGRESS.getValue())
|| StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue())
);
return flag;
}).collect(Collectors.toList());
@@ -6594,6 +6595,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
List<ProjectCertificationInventoryEO> testPassedPciEoList = pciEos.stream().filter(data -> {
boolean flag = (
StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.TEST_PASSED.getValue())
|| StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue())
|| StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue())
);
return flag;
}).collect(Collectors.toList());
@@ -6609,33 +6612,34 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
testFailedCount = (double) testFailedPciEoList.size();
// 部件报告未提交
List<ProjectCertificationInventoryEO> notSubmitPciEoList = pciEos.stream().filter(data -> {
boolean flag = (
StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue())
);
return flag;
}).collect(Collectors.toList());
notSubmitCount = (double) notSubmitPciEoList.size();
// List<ProjectCertificationInventoryEO> notSubmitPciEoList = pciEos.stream().filter(data -> {
// boolean flag = (
// StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue())
// );
// return flag;
// }).collect(Collectors.toList());
// notSubmitCount = (double) notSubmitPciEoList.size();
// 部件报告已提交
List<ProjectCertificationInventoryEO> reportSubmitPciEoList = pciEos.stream().filter(data -> {
boolean flag = (
StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue())
);
return flag;
}).collect(Collectors.toList());
reportSubmitCount = (double) reportSubmitPciEoList.size();
// List<ProjectCertificationInventoryEO> reportSubmitPciEoList = pciEos.stream().filter(data -> {
// boolean flag = (
// StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue())
// );
// return flag;
// }).collect(Collectors.toList());
// reportSubmitCount = (double) reportSubmitPciEoList.size();
// 部件报告已入库
List<ProjectCertificationInventoryEO> storedPciEoList = pciEos.stream().filter(data -> {
boolean flag = (
StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue())
);
return flag;
}).collect(Collectors.toList());
storedCount = (double) storedPciEoList.size();
// List<ProjectCertificationInventoryEO> storedPciEoList = pciEos.stream().filter(data -> {
// boolean flag = (
// StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue())
// );
// return flag;
// }).collect(Collectors.toList());
// storedCount = (double) storedPciEoList.size();
count = notStartCount + inProgressCount + testPassedCount + testFailedCount + testFailedCount + notSubmitCount + reportSubmitCount + storedCount;
// count = notStartCount + inProgressCount + testPassedCount + testFailedCount + testFailedCount + notSubmitCount + reportSubmitCount + storedCount;
count = notStartCount + inProgressCount + testPassedCount + testFailedCount + testFailedCount;
if(count<=0){
percentage = 0;
}else {
@@ -6648,9 +6652,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
projectScheduleExportMap.put("inProgressCount",inProgressCount);
projectScheduleExportMap.put("testPassedCount",testPassedCount);
projectScheduleExportMap.put("testFailedCount",testFailedCount);
projectScheduleExportMap.put("notSubmitCount",notSubmitCount);
projectScheduleExportMap.put("reportSubmitCount",reportSubmitCount);
projectScheduleExportMap.put("storedCount",storedCount);
// projectScheduleExportMap.put("notSubmitCount",notSubmitCount);
// projectScheduleExportMap.put("reportSubmitCount",reportSubmitCount);
// projectScheduleExportMap.put("storedCount",storedCount);
projectScheduleExportMap.put("count",count);
projectScheduleExportMap.put("percentage",percentageStr + percentSign);
result.put("projectScheduleExportMap",projectScheduleExportMap);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
+2 -1
View File
@@ -781,7 +781,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
boolean flag = (
StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_COLLECT.getValue())
|| StringUtils.equals(data.getState(), CollectManifestStateEnum.SDT_BACK.getValue())
|| StringUtils.equals(data.getState(), CollectManifestStateEnum.CHANGE.getValue())
// || StringUtils.equals(data.getState(), CollectManifestStateEnum.CHANGE.getValue())
);
return flag;
}).collect(Collectors.toList());
@@ -803,6 +803,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
List<ParamsCollectManifestEO> submitPcmEoList = datas.stream().filter(data -> {
boolean flag = (
StringUtils.equals(data.getState(), CollectManifestStateEnum.SUBMIT.getValue())
|| StringUtils.equals(data.getState(), CollectManifestStateEnum.CHANGE.getValue())
);
return flag;
}).collect(Collectors.toList());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+3 -3
View File
@@ -1135,9 +1135,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
double certificationProgressInProgressCount = (double) certificationProgressMapProjectScheduleExportMap.get("inProgressCount");
double certificationProgressTestPassedCount = (double) certificationProgressMapProjectScheduleExportMap.get("testPassedCount");
double certificationProgressTestFailedCount = (double) certificationProgressMapProjectScheduleExportMap.get("testFailedCount");
double certificationProgressNotSubmitCount = (double) certificationProgressMapProjectScheduleExportMap.get("notSubmitCount");
double certificationProgressReportSubmitCount = (double) certificationProgressMapProjectScheduleExportMap.get("reportSubmitCount");
double certificationProgressStoredCount = (double) certificationProgressMapProjectScheduleExportMap.get("storedCount");
// double certificationProgressNotSubmitCount = (double) certificationProgressMapProjectScheduleExportMap.get("notSubmitCount");
// double certificationProgressReportSubmitCount = (double) certificationProgressMapProjectScheduleExportMap.get("reportSubmitCount");
// double certificationProgressStoredCount = (double) certificationProgressMapProjectScheduleExportMap.get("storedCount");
// String certificationProgressCount = (String) certificationProgressMapProjectScheduleExportMap.get("count");
String certificationProgressPercentage = (String) certificationProgressMapProjectScheduleExportMap.get("percentage");
dataRow.createCell(38).setCellValue(certificationProgressNotStartCount);