diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 25471856b..63fb2a13e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -706,6 +706,12 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl> collectingList = new LinkedList<>(); List> submitList = new LinkedList<>(); List> syncReportList = new LinkedList<>(); + double totalAll = 0; + double notStartTotal = 0; + double collectingTotal = 0; + double submitTotal = 0; + double syncReportTotal = 0; + // 统计清单参数 ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO(); @@ -740,6 +746,14 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl notStartMap = new HashMap<>(); + notStartMap.put("quantity", notStartTotal); + notStartMap.put("percentage", getRatio(notStartTotal, totalAll)); + notStartList.add(0, notStartMap); + + Map collectinMap = new HashMap<>(); + collectinMap.put("quantity", collectingTotal); + collectinMap.put("percentage", getRatio(collectingTotal, totalAll)); + collectingList.add(0, collectinMap); + + Map submitMap = new HashMap<>(); + submitMap.put("quantity", submitTotal); + submitMap.put("percentage", getRatio(submitTotal, totalAll)); + submitList.add(0, submitMap); + + Map syncReportMap = new HashMap<>(); + syncReportMap.put("quantity", syncReportTotal); + syncReportMap.put("percentage", getRatio(syncReportTotal, totalAll)); + syncReportList.add(0, syncReportMap); + + // result.put("dutyTerritory", dutyTerritoryNameList); result.put("notStart", notStartList); result.put("collecting", collectingList);