From 2f4305f41fc02c0b6d85850b6f46bccd1c6989f5 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 28 Sep 2023 09:52:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...PlatformProjectLibraryBaseServiceImpl.java | 63 ++++++++++++------- .../PlatformTaskPlanningEOServiceImpl.java | 2 + 2 files changed, 41 insertions(+), 24 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java index 515b9be66..dd8e7a866 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java @@ -2519,7 +2519,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl params){ String cut = (String) params.get("cut"); +// String sheetName = "认证活动管理"; +// String firstTitle = "认证任务确认," + +// "Pre-Homo," + +// "认证进度"; +// String secondTitle = "责任领域（一级）," + +// "未发起,待确认,接受,拒绝,完成度," + +// "未发起,待确认,审查通过,审查退回,完成度," + +// "未开始,进行中,实验通过,实验失败,部件报告未上传,部件报告已上传,部件报告已入库,完成度"; +// if(StringUtils.equals(cut,CutEnum.EN.getValue())){ +// sheetName = "Certification Activity Management"; +// firstTitle = "Authentication task confirmation," + +// "Pre-Homo," + +// "Certification progress"; +// secondTitle = "Area of responsibility (level 1)," + +// "Not launched,To be confirmed,Accept,Refuse,Degree of completion," + +// "Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion," + +// "Not started,In progress,Experiment passed,Experiment failed,Parts report not uploaded,Parts report uploaded,Parts report in stock,Degree of completion"; +// } String sheetName = "认证活动管理"; String firstTitle = "认证任务确认," + - "Pre-Homo," + - "认证进度"; + "Pre-Homo"; String secondTitle = "责任领域（一级）," + "未发起,待确认,接受,拒绝,完成度," + - "未发起,待确认,审查通过,审查退回,完成度," + - "未开始,进行中,实验通过,实验失败,部件报告未上传,部件报告已上传,部件报告已入库,完成度"; + "未发起,待确认,审查通过,审查退回,完成度"; if(StringUtils.equals(cut,CutEnum.EN.getValue())){ sheetName = "Certification Activity Management"; firstTitle = "Authentication task confirmation," + - "Pre-Homo," + - "Certification progress"; + "Pre-Homo"; secondTitle = "Area of responsibility (level 1)," + "Not launched,To be confirmed,Accept,Refuse,Degree of completion," + - "Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion," + - "Not started,In progress,Experiment passed,Experiment failed,Parts report not uploaded,Parts report uploaded,Parts report in stock,Degree of completion"; + "Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion"; } HSSFSheet sheet = workbook.createSheet(sheetName); @@ -2800,10 +2814,10 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl certificationProgressStoredMap = (Map)certificationProgressMap.get(CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue()); double certificationProgressStoredAmount = (double) certificationProgressStoredMap.get("amount"); - dataRow.createCell(11).setCellValue(certificationProgressNotStartAmount); - dataRow.createCell(12).setCellValue(certificationProgressInProgressAmount); - dataRow.createCell(13).setCellValue(certificationProgressTestPassedAmount); - dataRow.createCell(14).setCellValue(certificationProgressTestFailedAmount); - dataRow.createCell(15).setCellValue(certificationProgressNotSubmitAmount); - dataRow.createCell(16).setCellValue(certificationProgressSubmitAmount); - dataRow.createCell(17).setCellValue(certificationProgressStoredAmount); +// dataRow.createCell(11).setCellValue(certificationProgressNotStartAmount); +// dataRow.createCell(12).setCellValue(certificationProgressInProgressAmount); +// dataRow.createCell(13).setCellValue(certificationProgressTestPassedAmount); +// dataRow.createCell(14).setCellValue(certificationProgressTestFailedAmount); +// dataRow.createCell(15).setCellValue(certificationProgressNotSubmitAmount); +// dataRow.createCell(16).setCellValue(certificationProgressSubmitAmount); +// dataRow.createCell(17).setCellValue(certificationProgressStoredAmount); double certificationProgressCount = certificationProgressNotStartAmount + certificationProgressInProgressAmount + certificationProgressTestPassedAmount + certificationProgressTestFailedAmount + certificationProgressNotSubmitAmount + certificationProgressSubmitAmount + certificationProgressStoredAmount; double certificationProgressPercentage = (certificationProgressTestPassedAmount / certificationProgressCount) * 100; String certificationProgressPercentageStr = (certificationProgressPercentage != 0 && (certificationProgressCount !=0 )) ? df.format(certificationProgressPercentage) : "0"; - dataRow.createCell(18).setCellValue(certificationProgressPercentageStr + percentSign); +// dataRow.createCell(18).setCellValue(certificationProgressPercentageStr + percentSign); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java index 3ee5b2e4d..c66620ffa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java @@ -13,6 +13,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @Description: 平台件合规认证计划 @@ -137,6 +138,7 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImplObjectUtils.isNotEmpty(e.getNodeTime())).collect(Collectors.toList()); return taskPlanningEOList; } } From c2aa29efb3660696ab44388eff09f4c4b4d0983a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 28 Sep 2023 10:02:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B9=E7=9B=AE=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PlatformProjectLawsInventoryEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java index 917180cee..772cb72a5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java @@ -10676,6 +10676,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl dictModelList = problemTypeList.stream().filter(e -> e.getValue().equals(problemManagementEO.getProblemType())).collect(Collectors.toList());