From f93c150dd0a2c34b74b631741e349c67a37331c6 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 24 Aug 2022 14:02:58 +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-bug58668?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsManifestEOServiceImpl.java     | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 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 66829d8f5..2ff7c916d 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
@@ -653,15 +653,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 		List<Map<String, Object>> listAll = paramsCollectManifestEOMapper.listInfoForExport(paramsCollectManifestEO);
 
 		// 循环责任领域，计算每个责任领域中的四种状态数据
-		dutyTerritoryDictList.forEach(item->{
-
-			if (CutEnum.EN.getValue().equals(cut)) {
-				dutyTerritoryNameList.add(item.getTextEn());
-
-			} else {
-				dutyTerritoryNameList.add(item.getText());
-
-			}
+		for (DictModel item : dutyTerritoryDictList) {
 
 			// 计算数量
 			double notStartNumber = listAll.stream().filter(e -> (CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.get("state"))
@@ -689,12 +681,22 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 			String syncReportPercent = getRatio(syncReportNumber, total); // 已同步上报库的参数项 百分比
 
 			// 组装数据 返回前端
+			if (notStartNumber == collectingNumber && collectingNumber == submitNumber && submitNumber == syncReportNumber && syncReportNumber == 0) {
+				 continue;
+			}
+
+			if (CutEnum.EN.getValue().equals(cut)) {
+				dutyTerritoryNameList.add(item.getTextEn());
+			} else {
+				dutyTerritoryNameList.add(item.getText());
+			}
+
 			getData(notStartList, notStartNumber, notStartPercent);
 			getData(collectingList, collectingNumber, collectingPercent);
 			getData(submitList, submitNumber, submitPercent);
 			getData(syncReportList, syncReportNumber, syncReportPercent);
 
-		});
+		}
 
 		result.put("dutyTerritory", dutyTerritoryNameList);
 		result.put("notStart", notStartList);