From 6a5c99ce357788e70ce1973e76649e06fb6e8ff2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 26 十月 2024 17:23:24 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..522954c 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
@@ -1292,7 +1296,7 @@
//当日的订单总数
int size = list.size();
//计算list中paymentAmount的总和
- BigDecimal totalPaymentAmount = list.stream().map(TChargingOrder::getOrderAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal totalPaymentAmount = list.stream().map(TChargingOrder::getPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
//计算list中electrovalence的总和
BigDecimal totalElectrovalence = list.stream().map(TChargingOrder::getElectrovalence).reduce(BigDecimal.ZERO, BigDecimal::add);
//计算list中serviceCharge的总和
--
Gitblit v1.7.1