From 397bfc8424f2b72d6ff40818da09107fbbf28abe Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期五, 15 八月 2025 17:49:42 +0800 Subject: [PATCH] yys 修改导入导出 --- 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