From 211aafe0cb765b1deb5f2ef54949d64e9b0de8c3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 03 十二月 2025 17:56:36 +0800
Subject: [PATCH] yys1.海川开心-修改首页库存与采购数据不显示问题 2.海川开心-优化选择审批人时增加模糊查询 3.海川开心-协同办公部门改为可手动输入 4.海川开心-修改回款流水导出没数据问题
---
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