From 1f46b7a18e34656baf965fa6627130ef59d14156 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Thu, 30 Dec 2021 13:26:07 +0800 Subject: [PATCH] 区域贡献率收据格式修改 --- screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java index 54daf3e..a4adcb6 100644 --- a/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java +++ b/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java @@ -281,15 +281,15 @@ allDeviceSum = Double.parseDouble(o.toString()); } - List<HistoryMonthly> preofessionDeviceHistoryMonthlyList = professionDataMap.get(resultTime); + List<HistoryMonthly> professionDeviceHistoryMonthlyList = professionDataMap.get(resultTime); //��������� String contributionRate = null; Double professionAvg = null; - if (!ObjectUtils.isEmpty(preofessionDeviceHistoryMonthlyList)) { + if (!ObjectUtils.isEmpty(professionDeviceHistoryMonthlyList)) { //��������������������� - professionAvg = historyMonthlyService.calculatedValue(preofessionDeviceHistoryMonthlyList, sensorCode, "avg"); + professionAvg = historyMonthlyService.calculatedValue(professionDeviceHistoryMonthlyList, sensorCode, "avg"); //������������������������ - Double professionSum = historyMonthlyService.calculatedValue(preofessionDeviceHistoryMonthlyList, sensorCode, "sum"); + Double professionSum = historyMonthlyService.calculatedValue(professionDeviceHistoryMonthlyList, sensorCode, "sum"); //��������������������� NumberFormat numberFormat = NumberFormat.getInstance(); numberFormat.setMaximumFractionDigits(2); -- Gitblit v1.8.0