From 06d3d15a5a08637041cc601101c063b11b07a346 Mon Sep 17 00:00:00 2001
From: net <net@netdeMBP.lan>
Date: 星期五, 14 二月 2025 17:25:21 +0800
Subject: [PATCH]  合并理去杀杀人

---
 zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 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 201c59f..d7ac636 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
@@ -66,10 +66,13 @@
     @Override
     public List<HomeEnergyStatisticsVO> energyConsumptionSummation(String timeType, String modelcode) {
         Date currentTime = new Date();
-//        Date currentTime = DateUtil.parseDateTime("2023-04-11 00:00:00");
 
         DateTime tongbiTime = DateUtil.offsetMonth(currentTime, -12);
         DateTime huanbiTime = DateUtil.offsetMonth(currentTime, -1);
+        if(TimeType.DAY.name().equals( timeType)){
+            huanbiTime = DateUtil.offsetDay(currentTime, -1);
+        }
+
         final List<HomeEnergyStatisticsVO> current = getEnergyTotalByTime(timeType, modelcode, currentTime);
         final List<HomeEnergyStatisticsVO> tongbi = getEnergyTotalByTime(timeType, modelcode, tongbiTime);
         final List<HomeEnergyStatisticsVO> huanbi = getEnergyTotalByTime(timeType, modelcode, huanbiTime);

--
Gitblit v1.9.3