From 0aaeac24560fd1a56061eeed88a3f462887ad3ce Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期六, 26 十月 2024 15:04:42 +0800 Subject: [PATCH] bug修改 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java index b833c5b..cdadf55 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java @@ -3,6 +3,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; +import java.text.DecimalFormat; import java.time.*; @@ -822,7 +823,7 @@ BeanUtils.copyProperties(uploadRealTimeMonitoringData,dataDto); dataDto.setStartTime(uploadRealTimeMonitoringData.getStartTime()); dataDto.setEndTime(uploadRealTimeMonitoringData.getEndTime()==null?null:uploadRealTimeMonitoringData.getEndTime()); - dataDto.setStatus(chargingOrderVO.getStatus()); + dataDto.setStatus(uploadRealTimeMonitoringData.getStatus()); dtos.add(dataDto); }else { continue; @@ -1239,8 +1240,8 @@ return R.ok(tCharingUserEquimentVO); } - - private static double calculateAveragePercent(List<Map<String, Object>> mapList1, List<Map<String, Object>> mapList2) { + private static final DecimalFormat DF = new DecimalFormat("#.00"); + public static double calculateAveragePercent(List<Map<String, Object>> mapList1, List<Map<String, Object>> mapList2) { int totalElements = mapList1.size() + mapList2.size(); double sum = 0.0; @@ -1262,7 +1263,10 @@ } // 计算平均值 - return sum / totalElements; + double average = sum / totalElements; + + // 格式化为两位小数 + return Double.parseDouble(DF.format(average)); } @ResponseBody -- Gitblit v1.7.1