新统计方式
This commit is contained in:
parent
4a333ba8b6
commit
2366d521be
|
|
@ -278,7 +278,9 @@ public class StaticticsServiceImpl {
|
||||||
String dbKey = db+StatisticConstants.RESULT_VALUE_AVG;
|
String dbKey = db+StatisticConstants.RESULT_VALUE_AVG;
|
||||||
String value = item.get(dbKey).toString();
|
String value = item.get(dbKey).toString();
|
||||||
String zhibiaoKey = NamingConverter.dbFieldToCamel(dbKey.replace(StatisticConstants.RESULT_VALUE_AVG,""));
|
String zhibiaoKey = NamingConverter.dbFieldToCamel(dbKey.replace(StatisticConstants.RESULT_VALUE_AVG,""));
|
||||||
List<String> zhibiaoData = dataMap.get(zhibiaoKey);
|
String name = PollutionEnum.catchPollution(zhibiaoKey).getDescription();
|
||||||
|
name = name.replace("水样","");
|
||||||
|
List<String> zhibiaoData = dataMap.get(name);
|
||||||
if(zhibiaoData==null){
|
if(zhibiaoData==null){
|
||||||
zhibiaoData = new ArrayList<>();
|
zhibiaoData = new ArrayList<>();
|
||||||
}
|
}
|
||||||
|
|
@ -286,8 +288,8 @@ public class StaticticsServiceImpl {
|
||||||
BigDecimal decimal = new BigDecimal(value);
|
BigDecimal decimal = new BigDecimal(value);
|
||||||
value = decimal.setScale(4, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString();
|
value = decimal.setScale(4, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString();
|
||||||
zhibiaoData.add(value);
|
zhibiaoData.add(value);
|
||||||
String name = PollutionEnum.catchPollution(zhibiaoKey).getDescription();
|
|
||||||
dataMap.put(name.replace("水样",""),zhibiaoData);
|
dataMap.put(name,zhibiaoData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue