From 589e1eec3f838c84f6c6a0ce71bae73f20d2266f Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 1 Aug 2022 14:19:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=A6=E6=83=85-=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsManifestEOServiceImpl.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 3a58e3598..99df45140 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -679,10 +679,10 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); // 组装数据 返回前端 List> data = new LinkedList<>(); - getData(data, cut, notStartNumber, notStartPercent); - getData(data, cut, collectingNumber, collectingPercent); - getData(data, cut, submitNumber, submitPercent); - getData(data, cut, syncReportNumber, syncReportPercent); + getData(data, cut, CollectManifestStatisticsStateEnum.NOT_START, notStartNumber, notStartPercent); + getData(data, cut, CollectManifestStatisticsStateEnum.COLLECTING, collectingNumber, collectingPercent); + getData(data, cut, CollectManifestStatisticsStateEnum.SUBMIT, submitNumber, submitPercent); + getData(data, cut, CollectManifestStatisticsStateEnum.SYNC_REPORT, syncReportNumber, syncReportPercent); if (CutEnum.EN.getValue().equals(cut)) { map.put(item.getTextEn(), data); @@ -698,20 +698,26 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl> data, String cut, double quantity, String percentage) { + private void getData(List> data, String cut, CollectManifestStatisticsStateEnum statisticsStateEnum, double quantity, String percentage) { Map notStartMap = new HashMap<>(); if (CutEnum.EN.getValue().equals(cut)) { - notStartMap.put("name", CollectManifestStatisticsStateEnum.NOT_START.getEnName()); + notStartMap.put("name", statisticsStateEnum.getEnName()); } else { - notStartMap.put("name", CollectManifestStatisticsStateEnum.NOT_START.getName()); + notStartMap.put("name", statisticsStateEnum.getName()); } - notStartMap.put("type", CollectManifestStatisticsStateEnum.NOT_START.getValue()); + notStartMap.put("type", statisticsStateEnum.getValue()); notStartMap.put("quantity", quantity); notStartMap.put("percentage", percentage); data.add(notStartMap); } + /** + * 计算百分比 + * @param d1 + * @param d2 + * @return + */ private String getRatio(Double d1, Double d2) { if (d1 == null || d2 == null || d2 <= 0) { return "0%";