diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/StaticticsServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/StaticticsServiceImpl.java index 8263cd5..5f537d3 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/StaticticsServiceImpl.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/StaticticsServiceImpl.java @@ -278,7 +278,9 @@ public class StaticticsServiceImpl { String dbKey = db+StatisticConstants.RESULT_VALUE_AVG; String value = item.get(dbKey).toString(); String zhibiaoKey = NamingConverter.dbFieldToCamel(dbKey.replace(StatisticConstants.RESULT_VALUE_AVG,"")); - List zhibiaoData = dataMap.get(zhibiaoKey); + String name = PollutionEnum.catchPollution(zhibiaoKey).getDescription(); + name = name.replace("水样",""); + List zhibiaoData = dataMap.get(name); if(zhibiaoData==null){ zhibiaoData = new ArrayList<>(); } @@ -286,8 +288,8 @@ public class StaticticsServiceImpl { BigDecimal decimal = new BigDecimal(value); value = decimal.setScale(4, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString(); zhibiaoData.add(value); - String name = PollutionEnum.catchPollution(zhibiaoKey).getDescription(); - dataMap.put(name.replace("水样",""),zhibiaoData); + + dataMap.put(name,zhibiaoData); } } }