平均值数量 不格式化

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java

@@ -219,27 +219,29 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                     }
                 } else {
                     tb.setOriginValue(score.getOriginValue());
-                }
+                    formatOriginValue(score, tb);
-
-
-                //小数类型，四舍五入保留小数点后一位
-                if (FactConstant.INTEGER.equals(score.getValueType())) {
-                    BigDecimal num = new BigDecimal(tb.getOriginValue()).setScale(0, BigDecimal.ROUND_HALF_UP);
-                    tb.setOriginValue(num.toString());
-                }
-                if (FactConstant.DECIMAL.equals(score.getValueType())) {
-                    BigDecimal num = new BigDecimal(tb.getOriginValue()).setScale(1, BigDecimal.ROUND_HALF_UP);
-                    tb.setOriginValue(num.toString());
-                }
-                //百分数类型，四舍五入保留小数点后一位并转成百分比
-                if (FactConstant.PERCENT.equals(score.getValueType())) {
-                    BigDecimal num = new BigDecimal(tb.getOriginValue()).setScale(1, BigDecimal.ROUND_HALF_UP);
-                    tb.setOriginValue(num + "%");
                 }
             }
         }
     }
 
+    private void formatOriginValue(IndexScoreResult score, IndexScoreDetailResult index) {
+        //小数类型，四舍五入保留小数点后一位
+        if (FactConstant.INTEGER.equals(score.getValueType())) {
+            BigDecimal num = new BigDecimal(index.getOriginValue()).setScale(0, BigDecimal.ROUND_HALF_UP);
+            index.setOriginValue(num.toString());
+        }
+        if (FactConstant.DECIMAL.equals(score.getValueType())) {
+            BigDecimal num = new BigDecimal(index.getOriginValue()).setScale(1, BigDecimal.ROUND_HALF_UP);
+            index.setOriginValue(num.toString());
+        }
+        //百分数类型，四舍五入保留小数点后一位并转成百分比
+        if (FactConstant.PERCENT.equals(score.getValueType())) {
+            BigDecimal num = new BigDecimal(index.getOriginValue()).setScale(1, BigDecimal.ROUND_HALF_UP);
+            index.setOriginValue(num + "%");
+        }
+    }
+
     private List<IndexScoreDetailResult> setDefaultTableData(String orgLevel, String type, Map<String, List<IndexGroupDetailResult>> detailEntityMap,
                                                              IndexExplainResult result, String allIndexCodePath, List<IndexGroupDetailResult> indexGroupDetailEntities) {
         if (indexGroupDetailEntities == null) {
@@ -253,13 +255,13 @@ public class IndexExplainServiceImpl implements IndexExplainService {
         List<String> threlodList = new ArrayList<>();
         indexGroupDetailEntities.forEach(index -> {
             IndexScoreDetailResult table = new IndexScoreDetailResult();
-            if ("grid".equals(orgLevel) && IndexConstant.ZI_SHEN.equals(type) && index.getAllIndexCodePath().contains(IndexConstant.XIA_JI)) {
+            if (OrgLevelEnum.GRID.equals(orgLevel) && IndexConstant.ZI_SHEN.equals(type) && index.getAllIndexCodePath().contains(IndexConstant.XIA_JI)) {
                 return;
             }
-            if ("district".equals(orgLevel) && !index.getAllIndexCodePath().contains(type) && !index.getAllIndexCodePath().contains(IndexConstant.ZHI_LI_NENG_LI)) {
+            if (OrgLevelEnum.DISTRICT.equals(orgLevel) && !index.getAllIndexCodePath().contains(type) && !index.getAllIndexCodePath().contains(IndexConstant.ZHI_LI_NENG_LI)) {
                 return;
             }
-            if (!"grid".equals(orgLevel) && !"district".equals(orgLevel) && !index.getAllIndexCodePath().contains(type)) {
+            if (!OrgLevelEnum.GRID.equals(orgLevel) && !OrgLevelEnum.DISTRICT.equals(orgLevel) && !index.getAllIndexCodePath().contains(type)) {
                 return;
             }
             table.setIndexCode(index.getIndexCode());
@@ -300,13 +302,14 @@ public class IndexExplainServiceImpl implements IndexExplainService {
 
     private List<String> getTableHeaders(String type, String allIndexCode, String orgLevel) {
         List<String> headers = new ArrayList<>();
-        switch (orgLevel) {
+        OrgLevelEnum anEnum = OrgLevelEnum.getEnum(orgLevel);
-            case "grid":
+        switch (anEnum) {
+            case GRID:
                 //还没确定怎么搞
-                if ("zishen".equals(type)) {
+                if (IndexConstant.ZI_SHEN.equals(type)) {
                     headers = IndexConstant.getStandardSelfHeaders(allIndexCode);
 
-                } else if ("xiaji".equals(type)) {
+                } else if (IndexConstant.XIA_JI.equals(type)) {
                     headers = new ArrayList<>(IndexConstant.QuantityLastHeader);
                     if (allIndexCode.contains("canyuyishi")) {
                         headers.add(0, "组织内党员的参与议事指数考评分（平均值）");
@@ -315,11 +318,11 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                     }
                     break;
                 }
-            case "district":
+            case DISTRICT:
-                if ("zishen".equals(type)) {
+                if (IndexConstant.ZI_SHEN.equals(type)) {
                     headers = IndexConstant.getStandardSelfHeaders(allIndexCode);
 
-                } else if ("xiaji".equals(type)) {
+                } else if (IndexConstant.XIA_JI.equals(type)) {
                     headers = new ArrayList<>(IndexConstant.QuantityLastHeader);
                     if (allIndexCode.contains("quzhibumen")) {
                         headers.add(0, "区直部门各项治理指数指标");
@@ -329,10 +332,10 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                 }
                 break;
             default:
-                if ("zishen".equals(type)) {
+                if (IndexConstant.ZI_SHEN.equals(type)) {
                     headers = IndexConstant.getStandardSelfHeaders(allIndexCode);
 
-                } else if ("xiaji".equals(type)) {
+                } else if (IndexConstant.XIA_JI.equals(type)) {
                     headers = IndexConstant.getStandardSubHeaders(allIndexCode);
                 }
         }