From 3774b14d25dc04390042e76d1b34d67bf0c708fd Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 13 Oct 2023 10:14:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF-=E5=AF=BC=E5=87=BA=EF=BC=88=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=EF=BC=8CPre-Homo=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E8=AE=A4=E8=AF=81=E8=BF=9B=E5=BA=A6=EF=BC=8C?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86=E8=BF=9B=E5=BA=A6=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 60 ++++++++++--------- .../ProjectLibraryStatisticsServiceImpl.java | 3 +- .../impl/ProjectStatusBoardServiceImpl.java | 6 +- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 50a1033e7..a1522a076 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -6563,9 +6563,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl 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 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 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 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 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 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 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 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 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()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java index 375232f46..cf38c9ff3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java @@ -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);