From 9507c03f27cd8fa99381142236cc2eafbe01868d Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期四, 10 四月 2025 18:36:54 +0800
Subject: [PATCH] Merge pull request #50 from zhitan-cloud/zhangjw
---
zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java | 11 ++++++++++-
zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java | 2 +-
2 files changed, 11 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 86ce5c5..455488b 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
@@ -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(vo.getCount() * Double.valueOf(vo.getCoefficient())));
+ vo.setTonCount(format2Double(count));
if (tongbiCount != 0) {
vo.setTongbi(format2Double((count - tongbiCount) / tongbiCount * 100));
} else {
diff --git a/zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java b/zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java
index 968c4d7..99aada3 100644
--- a/zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java
+++ b/zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java
@@ -55,6 +55,15 @@
if (ObjectUtils.isEmpty(timeType)) {
return TimeType.DAY;
}
- return timeType;
+ switch (timeType) {
+ case DAY:
+ return TimeType.HOUR;
+ case MONTH:
+ return TimeType.DAY;
+ case YEAR:
+ return TimeType.MONTH;
+ default:
+ return timeType;
+ }
}
}
--
Gitblit v1.9.3