From b78f044e3ec24c0e4c2d477e469434d514cb3d42 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 12 三月 2026 17:32:18 +0800
Subject: [PATCH] 合并下发时判断ids是否存在
---
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