Commit 8203d4f0 authored by suhuiguang's avatar suhuiguang

1.气瓶大屏统计未换成小数自测bug

parent 77ac5fe0
...@@ -117,7 +117,7 @@ public class AQZSDPStatisticsServiceImpl { ...@@ -117,7 +117,7 @@ public class AQZSDPStatisticsServiceImpl {
} }
BigDecimal bigTotalUnitNumber = new BigDecimal(String.valueOf(totalUnitNumber)); BigDecimal bigTotalUnitNumber = new BigDecimal(String.valueOf(totalUnitNumber));
BigDecimal bigOkUnitNumberNumber = new BigDecimal(String.valueOf(okUnitNumberNumber)); BigDecimal bigOkUnitNumberNumber = new BigDecimal(String.valueOf(okUnitNumberNumber));
BigDecimal result = bigOkUnitNumberNumber.divide(bigTotalUnitNumber, 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2); BigDecimal result = bigOkUnitNumberNumber.divide(bigTotalUnitNumber, 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2,RoundingMode.HALF_UP);
return result.toPlainString(); return result.toPlainString();
} }
...@@ -175,12 +175,12 @@ public class AQZSDPStatisticsServiceImpl { ...@@ -175,12 +175,12 @@ public class AQZSDPStatisticsServiceImpl {
List<String> xdata = stCommonService.buildXData(regionModels); List<String> xdata = stCommonService.buildXData(regionModels);
regionModels.forEach(r -> { regionModels.forEach(r -> {
SecurityIndexCountItemDto countItemDto = regionCodeSecurityIndexMap.get(r.getRegionCode().toString()); SecurityIndexCountItemDto countItemDto = regionCodeSecurityIndexMap.get(r.getRegionCode().toString());
xuke.add(countItemDto.getXuke()); xuke.add(this.castScore2Percent(countItemDto.getXuke()));
shiyongdengji.add(countItemDto.getShiyongdengji()); shiyongdengji.add(this.castScore2Percent(countItemDto.getShiyongdengji()));
jianyanchaoqi.add(countItemDto.getJianyanchaoqi()); jianyanchaoqi.add(this.castScore2Percent(countItemDto.getJianyanchaoqi()));
jianyanhege.add(countItemDto.getJianyanhege()); jianyanhege.add(this.castScore2Percent(countItemDto.getJianyanhege()));
czjc.add(countItemDto.getCzjc()); czjc.add(this.castScore2Percent(countItemDto.getCzjc()));
czjchege.add(countItemDto.getCzjchege()); czjchege.add(this.castScore2Percent(countItemDto.getCzjchege()));
}); });
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
result.put("xdata", xdata); result.put("xdata", xdata);
...@@ -194,6 +194,12 @@ public class AQZSDPStatisticsServiceImpl { ...@@ -194,6 +194,12 @@ public class AQZSDPStatisticsServiceImpl {
return result; return result;
} }
private String castScore2Percent(String score) {
BigDecimal big = new BigDecimal(score);
BigDecimal percent = big.divide(new BigDecimal("100"),2,RoundingMode.HALF_UP);
return percent.toPlainString();
}
private Set<String> getLegendForCyArea() { private Set<String> getLegendForCyArea() {
Set<String> legendData = new HashSet<>(); Set<String> legendData = new HashSet<>();
legendData.add("许可有效率"); legendData.add("许可有效率");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment