From fdaebc9fbc92ddf07ecfddc6567dc142df6cf0a7 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 24 Nov 2022 11:33:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95-=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E4=B8=AD?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86=E7=BB=9F=E8=AE=A1=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=89=80=E6=9C=89=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsManifestEOServiceImpl.java     | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

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<ParamsManifestEOMap
 		List<Map<String, Object>> collectingList = new LinkedList<>();
 		List<Map<String, Object>> submitList = new LinkedList<>();
 		List<Map<String, Object>> 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<ParamsManifestEOMap
 			String submitPercent = getRatio(submitNumber, total); // 已提交的参数项 百分比
 			String syncReportPercent = getRatio(syncReportNumber, total); // 已同步上报库的参数项 百分比
 
+			// 累加
+			totalAll += total;
+			notStartTotal += notStartNumber;
+			collectingTotal += collectingNumber;
+			submitTotal += submitNumber;
+			syncReportTotal += syncReportNumber;
+
+
 			// 组装数据 返回前端
 			if (notStartNumber == collectingNumber && collectingNumber == submitNumber && submitNumber == syncReportNumber && syncReportNumber == 0) {
 				 continue;
@@ -758,6 +772,34 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 
 		}
 
+		// 设置全部
+		if (CutEnum.EN.getValue().equals(cut)) {
+			dutyTerritoryNameList.add(0, "All");
+		} else {
+			dutyTerritoryNameList.add(0, "全部");
+		}
+
+		Map<String, Object> notStartMap = new HashMap<>();
+		notStartMap.put("quantity", notStartTotal);
+		notStartMap.put("percentage", getRatio(notStartTotal, totalAll));
+		notStartList.add(0, notStartMap);
+
+		Map<String, Object> collectinMap = new HashMap<>();
+		collectinMap.put("quantity", collectingTotal);
+		collectinMap.put("percentage", getRatio(collectingTotal, totalAll));
+		collectingList.add(0, collectinMap);
+
+		Map<String, Object> submitMap = new HashMap<>();
+		submitMap.put("quantity", submitTotal);
+		submitMap.put("percentage", getRatio(submitTotal, totalAll));
+		submitList.add(0, submitMap);
+
+		Map<String, Object> 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);