Просмотр исходного кода

合格/不合格项目数默认为0

lixing 3 лет назад
Родитель
Сommit
ece05d8f54

+ 2 - 2
src/main/java/com/persagy/apm/report/paragraphs/service/impl/energybudget/AreaEnergyBudgetBuilder.java

@@ -65,9 +65,9 @@ public class AreaEnergyBudgetBuilder extends AreaDepsParagraphBuilder {
         }
 
         // 获取能耗超过预算的子分区数目,如果没有子分区,按项目数统计
-        Integer excessBudgetDepCountValue = getExcessBudgetDepCount(paragraphContentVO);
+            Integer excessBudgetDepCountValue = getExcessBudgetDepCount(paragraphContentVO);
         String excessBudgetDepCountValueStr = excessBudgetDepCountValue == null ?
-                null : String.valueOf(excessBudgetDepCountValue);
+                "0" : String.valueOf(excessBudgetDepCountValue);
         AttrValueVO excessBudgetDepCount = new AttrValueVO(
                 BudgetHeaderCodes.excessBudgetDepCount.name(), excessBudgetDepCountValueStr,
                 AttrValueTypeEnum.number);

+ 1 - 1
src/main/java/com/persagy/apm/report/paragraphs/service/impl/energyefficiency/AreaEnergyEfficiencyBuilder.java

@@ -139,7 +139,7 @@ public class AreaEnergyEfficiencyBuilder extends AreaIndicatorsParagraphBuilder
         // 不合格项目数
         AttrValueVO unqualifiedCount = new AttrValueVO(
                 AreaEnergyEfficiencyContentCodes.unqualifiedCount.name(),
-                unqualifiedProjectCount == null ? null : String.valueOf(unqualifiedProjectCount),
+                unqualifiedProjectCount == null ? "0" : String.valueOf(unqualifiedProjectCount),
                 AttrValueTypeEnum.number);
         attrs.add(unqualifiedCount);
         // 不合格率

+ 2 - 2
src/main/java/com/persagy/apm/report/paragraphs/service/impl/env/AreaEnvBuilder.java

@@ -193,14 +193,14 @@ public class AreaEnvBuilder extends AreaIndicatorsParagraphBuilder {
         attrs.add(qualifiedStandard);
         // 不合格项目数
         String unqualifiedProjectCountStr = unqualifiedProjectCount == null ?
-                null : String.valueOf(unqualifiedProjectCount);
+                "0" : String.valueOf(unqualifiedProjectCount);
         AttrValueVO unqualifiedCount = new AttrValueVO(
                 AreaEnvContentCodes.unqualifiedCount.name(),
                 unqualifiedProjectCountStr, AttrValueTypeEnum.number);
         attrs.add(unqualifiedCount);
         // 合格项目数
         String qualifiedProjectCountStr = qualifiedProjectCount == null ?
-                null : String.valueOf(qualifiedProjectCount);
+                "0" : String.valueOf(qualifiedProjectCount);
         AttrValueVO qualifiedCount = new AttrValueVO(
                 AreaEnvContentCodes.qualifiedCount.name(),
                 qualifiedProjectCountStr, AttrValueTypeEnum.number);

+ 3 - 3
src/main/java/com/persagy/apm/report/paragraphs/service/impl/iot/AreaIotBuilder.java

@@ -95,7 +95,7 @@ public class AreaIotBuilder extends AreaIndicatorsParagraphBuilder {
         attrs.add(qualifiedStandard);
         // 不合格项目数
         String unqualifiedProjectCountStr = unqualifiedProjectCount == null ?
-                null : String.valueOf(unqualifiedProjectCount);
+                "0" : String.valueOf(unqualifiedProjectCount);
         AttrValueVO unqualifiedCount = new AttrValueVO(
                 AreaIotContentCodes.unqualifiedCount.name(),
                 unqualifiedProjectCountStr, AttrValueTypeEnum.number);
@@ -144,7 +144,7 @@ public class AreaIotBuilder extends AreaIndicatorsParagraphBuilder {
         String unqualifiedProjectCount = null;
         // 总项目数
         List<SimpleProjectVO> simpleProjectList = reportOutlineService.queryRelatedProjects(reportOutline);
-        String projectCountStr = simpleProjectList == null ? null : String.valueOf(simpleProjectList.size());
+        String projectCountStr = simpleProjectList == null ? "0" : String.valueOf(simpleProjectList.size());
 
         List<ItemVO> items = paragraphContentVO.getItems();
         Set<String> attrCodeSet = Sets.newSet(
@@ -157,7 +157,7 @@ public class AreaIotBuilder extends AreaIndicatorsParagraphBuilder {
                 List<AttrValueVO> attrs = item.getAttrs();
                 Map<String, AttrValueVO> attrMap = attrValueList2Map(attrCodeSet, attrs);
                 String itemUnqualifiedProjectCount = attrMap.get(AreaIotContentCodes.unqualifiedCount.name()).getValue();
-                itemUnqualifiedProjectCount = itemUnqualifiedProjectCount == null ? "--" : itemUnqualifiedProjectCount;
+                itemUnqualifiedProjectCount = itemUnqualifiedProjectCount == null ? "0" : itemUnqualifiedProjectCount;
                 String itemInfo = item.getName() + itemUnqualifiedProjectCount + "个";
                 unqualifiedProjectCount = unqualifiedProjectCount == null ?
                         itemInfo : unqualifiedProjectCount + "," + itemInfo;