From 4473a4cf043a6ac3a44ac7d932c8c530766416d3 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 12 Oct 2023 13:51:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AF=BC=E5=87=BA-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=90=9C=E9=9B=86=E8=BF=9B=E5=BA=A6=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IProjectLibraryStatisticsService.java | 2 + .../impl/ProjectLibraryBaseServiceImpl.java | 2 +- .../ProjectLibraryStatisticsServiceImpl.java | 64 ++++++++++++++++++- 3 files changed, 64 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java index c9db860f1..4046b8f59 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java @@ -84,4 +84,6 @@ public interface IProjectLibraryStatisticsService { * @return */ Map getParameterCollectingStatisticsGroupByTerritory(List datas, Map params); + + Map getParameterCollectingStatisticsGroupByTerritoryExport(List datas, Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 0ae3ab0ef..db4ccc29b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -3515,7 +3515,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl params, HSSFSheet sheet, int dataIndex, String key, List pcmEos) { - Map parameterCollectingMap = this.projectLibraryStatisticsService.getParameterCollectingStatisticsGroupByTerritory(pcmEos,params); + Map parameterCollectingMap = this.projectLibraryStatisticsService.getParameterCollectingStatisticsGroupByTerritoryExport(pcmEos,params); Map notStartMap = (Map) parameterCollectingMap.get(CollectManifestStatisticsStateEnum.NOT_START.getValue()); double notStartAmount = (double) notStartMap.get("amount"); Map collectingMap = (Map) parameterCollectingMap.get(CollectManifestStatisticsStateEnum.COLLECTING.getValue()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java index bcd80f318..d5903a0f2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java @@ -776,7 +776,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati Map collectingMap = new HashMap<>(); Map submitMap = new HashMap<>(); Map syncReporMap = new HashMap<>(); - + //未发起 List notStartPcmEoList = datas.stream().filter(data -> { boolean flag = ( StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_COLLECT.getValue()) @@ -787,7 +787,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati }).collect(Collectors.toList()); double notStartCount = (double) notStartPcmEoList.size(); notStartMap.put("amount",notStartCount); - + //收集中 List collectingPcmEoList = datas.stream().filter(data -> { boolean flag = ( StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_FILL.getValue()) @@ -799,7 +799,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati }).collect(Collectors.toList()); double collectingCount = (double) collectingPcmEoList.size(); collectingMap.put("amount",collectingCount); - + //已提交 List submitPcmEoList = datas.stream().filter(data -> { boolean flag = ( StringUtils.equals(data.getState(), CollectManifestStateEnum.SUBMIT.getValue()) @@ -808,7 +808,65 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati }).collect(Collectors.toList()); double submitCount = (double) submitPcmEoList.size(); submitMap.put("amount",submitCount); + //已同步至上报库 + List syncReporPcmEoList = datas.stream().filter(data -> { + boolean flag = ( + StringUtils.equals(data.getState(), CollectManifestStateEnum.SYNC_REPORT.getValue()) + ); + return flag; + }).collect(Collectors.toList()); + double syncReporCount = (double) syncReporPcmEoList.size(); + syncReporMap.put("amount",syncReporCount); + result.put(CollectManifestStatisticsStateEnum.NOT_START.getValue(),notStartMap); + result.put(CollectManifestStatisticsStateEnum.COLLECTING.getValue(),collectingMap); + result.put(CollectManifestStatisticsStateEnum.SUBMIT.getValue(),submitMap); + result.put(CollectManifestStatisticsStateEnum.SYNC_REPORT.getValue(),syncReporMap); + } + return result; + } + @Override + public Map getParameterCollectingStatisticsGroupByTerritoryExport(List datas, Map params) { + Map result = new HashMap<>(); + if(CollectionUtils.isNotEmpty(datas)){ + Map notStartMap = new HashMap<>(); + Map collectingMap = new HashMap<>(); + Map submitMap = new HashMap<>(); + Map syncReporMap = new HashMap<>(); + //未发起 + List notStartPcmEoList = datas.stream().filter(data -> { + 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()) + ); + return flag; + }).collect(Collectors.toList()); + double notStartCount = (double) notStartPcmEoList.size(); + notStartMap.put("amount",notStartCount); + //收集中 + List collectingPcmEoList = datas.stream().filter(data -> { + boolean flag = ( + StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_FILL.getValue()) + || StringUtils.equals(data.getState(),CollectManifestStateEnum.WAIT_SDT.getValue()) + || StringUtils.equals(data.getState(),CollectManifestStateEnum.DRE_BACK.getValue()) + || StringUtils.equals(data.getState(),CollectManifestStateEnum.CERT_BACK.getValue()) + ); + return flag; + }).collect(Collectors.toList()); + double collectingCount = (double) collectingPcmEoList.size(); + collectingMap.put("amount",collectingCount); + //已提交 + List 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()); + double submitCount = (double) submitPcmEoList.size(); + submitMap.put("amount",submitCount); + //已同步至上报库 List syncReporPcmEoList = datas.stream().filter(data -> { boolean flag = ( StringUtils.equals(data.getState(), CollectManifestStateEnum.SYNC_REPORT.getValue())