From be00cf3712c545f4ae97e249c0984cc2beece926 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期日, 13 四月 2025 11:52:11 +0800
Subject: [PATCH] Merge pull request #57 from zhitan-cloud/develop1.0
---
zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java
index edaf0ea..86ce5c5 100644
--- a/zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java
@@ -37,7 +37,7 @@
/**
* description todu
*
- * @author ZhiTan
+ * @author hmj
* @date 2024-10-31 18:07
*/
@Service
@@ -76,7 +76,7 @@
final Double tongbiCount = tongbiMap.get(energyNo).stream().map(HomeEnergyStatisticsVO::getCount).mapToDouble(Double::doubleValue).sum();
final Double huanbiCount = huanbiMap.get(energyNo).stream().map(HomeEnergyStatisticsVO::getCount).mapToDouble(Double::doubleValue).sum();
- vo.setTonCount(format2Double(count));
+ vo.setTonCount(format2Double(vo.getCount() * Double.valueOf(vo.getCoefficient())));
if (tongbiCount != 0) {
vo.setTongbi(format2Double((count - tongbiCount) / tongbiCount * 100));
} else {
--
Gitblit v1.9.3