maven
3 天以前 73fd3f387147a96a1ed21d3ad89fdeb600fce298
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);