项目库-项目详情-参数收集统计-bug58668

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->{
+		for (DictModel item : dutyTerritoryDictList) {
-
-			if (CutEnum.EN.getValue().equals(cut)) {
-				dutyTerritoryNameList.add(item.getTextEn());
-
-			} else {
-				dutyTerritoryNameList.add(item.getText());
-
-			}
 
 			// 计算数量
 			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);