From 3f2d4ba07ee9e1e0ddba97b43dc70af09f0e39a2 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 17:40:30 +0800
Subject: [PATCH] 审核附件修改
---
src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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..486ad48 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.mapper.DeviceLedgerMapper;
import com.ruoyi.device.pojo.DeviceLedger;
@@ -12,8 +11,8 @@
import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
import com.ruoyi.equipmentenergyconsumption.service.EquipmentEnergyConsumptionService;
import com.ruoyi.framework.web.domain.AjaxResult;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
@@ -29,14 +28,12 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class EquipmentEnergyConsumptionServiceImpl extends ServiceImpl<EquipmentEnergyConsumptionMapper, EquipmentEnergyConsumption> implements EquipmentEnergyConsumptionService {
- @Autowired
- private EquipmentEnergyConsumptionMapper equipmentEnergyConsumptionMapper;
-
- @Autowired
- private DeviceLedgerMapper deviceLedgerMapper;
+ private final EquipmentEnergyConsumptionMapper equipmentEnergyConsumptionMapper;
+ private final DeviceLedgerMapper deviceLedgerMapper;
@Override
public IPage<EquipmentEnergyConsumption> listPage(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
@@ -71,8 +68,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