From 838a95511dd87e28a278fb0ff2b739100e94ddb3 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 08 八月 2025 14:45:54 +0800
Subject: [PATCH] 增添用电时段功能

---
 src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java
index 53214cc..90b3d8f 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java
@@ -71,8 +71,8 @@
                 // 璁$畻鏈湀骞冲潎鐢甸噺锛堟眰鍜屾寜鑷劧鏈堟潵锛屾寜30澶╂眰骞冲潎鏁帮級
                 List<EquipmentEnergyConsumption> eqmList = equipmentEnergyConsumptionMapper.selectList(new LambdaQueryWrapper<EquipmentEnergyConsumption>()
                         .eq(EquipmentEnergyConsumption::getCode, item.getCode())
-                        .ge(EquipmentEnergyConsumption::getRunDate, lastDay)
-                        .lt(EquipmentEnergyConsumption::getRunDate, firstDay));
+                        .ge(EquipmentEnergyConsumption::getRunDate, firstDay)
+                        .lt(EquipmentEnergyConsumption::getRunDate, lastDay));
                 if (!CollectionUtils.isEmpty(eqmList)){
                     BigDecimal avgNum = eqmList.stream().map(EquipmentEnergyConsumption::getDayNum).reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal(30), 2, RoundingMode.HALF_UP);
                     item.setAvgNum(avgNum);

--
Gitblit v1.9.3