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%";