ソースを参照

修复多项目报告环境、数据质量段落中的空指针异常

lixing 3 年 前
コミット
d859111112

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

@@ -166,9 +166,9 @@ public class AreaEnvBuilder extends AreaIndicatorsParagraphBuilder {
             projectsComplianceRate.add(graphItemVO);
             // 统计不合格项目数与合格项目数
             String isQualifiedDesc = attrValueMap.get(ProjectEnvContentCodes.complianceRateIsQualified.name()).getValue();
-            if (isQualifiedDesc.equals(QualifiedEnum.NOT_QUALIFIED.getDesc())) {
+            if (QualifiedEnum.NOT_QUALIFIED.getDesc().equals(isQualifiedDesc)) {
                 unqualifiedProjectCount = unqualifiedProjectCount == null ? 1 : unqualifiedProjectCount + 1;
-            } else if (isQualifiedDesc.equals(QualifiedEnum.QUALIFIED.getDesc())) {
+            } else if (QualifiedEnum.QUALIFIED.getDesc().equals(isQualifiedDesc)) {
                 qualifiedProjectCount = qualifiedProjectCount == null ? 1 : qualifiedProjectCount + 1;
             }
         }

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

@@ -84,7 +84,7 @@ public class AreaIotBuilder extends AreaIndicatorsParagraphBuilder {
             currentMonthValueList.add(graphItemVO);
             // 统计不合格项目数
             String isQualifiedDesc = attrValueMap.get(ProjectIotContentCodes.isQualified.name()).getValue();
-            if (isQualifiedDesc.equals(QualifiedEnum.NOT_QUALIFIED.getDesc())) {
+            if (QualifiedEnum.NOT_QUALIFIED.getDesc().equals(isQualifiedDesc)) {
                 unqualifiedProjectCount = unqualifiedProjectCount == null ? 1 : unqualifiedProjectCount + 1;
             }
         }