From 423ac2a5e7e451248d8cdfc2cda3f32dba0ec8f8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 11 三月 2026 17:59:52 +0800
Subject: [PATCH] feat: 生产计划关联物料信息表
---
src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java b/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
index 305ad75..fd0e5e2 100644
--- a/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
+++ b/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
@@ -7,12 +7,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.energy.dto.EnergyConsumptionDetailDto;
+import com.ruoyi.energy.dto.EnergyConsumptionTypeDto;
+import com.ruoyi.energy.dto.EnergyCostDto;
+import com.ruoyi.energy.dto.EnergyStatisticsDto;
import com.ruoyi.energy.mapper.EnergyMapper;
import com.ruoyi.energy.pojo.Energy;
import com.ruoyi.energy.pojo.EnergyConsumptionDetail;
import com.ruoyi.energy.mapper.EnergyConsumptionDetailMapper;
import com.ruoyi.energy.service.EnergyConsumptionDetailService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.energy.vo.EnergyStatisticsVo;
import com.ruoyi.framework.web.domain.R;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +24,11 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -81,11 +89,41 @@
@Override
public void export(HttpServletResponse response) {
- List<EnergyConsumptionDetailDto> list = energyConsumptionDetailMapper.pageEnergyConsumptionDetail(new Page<>(-1,-1),null).getRecords();
+ List<EnergyConsumptionDetailDto> list = energyConsumptionDetailMapper.pageEnergyConsumptionDetail(new Page<>(-1,-1),new EnergyConsumptionDetailDto()).getRecords();
if(CollectionUtils.isEmpty(list)){
throw new RuntimeException("鏃犲鍑烘暟鎹�");
}
ExcelUtil<EnergyConsumptionDetailDto> util = new ExcelUtil<>(EnergyConsumptionDetailDto.class);
util.exportExcel(response, list, "鑳借�楁妱琛�");
}
+
+ @Override
+ public EnergyStatisticsDto statistics(EnergyStatisticsVo energyStatisticsVo) {
+ EnergyStatisticsDto energyStatisticsDto = new EnergyStatisticsDto();
+ //璁＄畻鎬昏�楃敤閲�+鎬昏兘鑰楄垂鐢�
+ Map<String, BigDecimal> map=energyConsumptionDetailMapper.calculateEnergy(energyStatisticsVo);
+ energyStatisticsDto.setTotalEnergyConsumption(map.get("totalEnergyConsumption"));
+ energyStatisticsDto.setTotalEnergyCost(map.get("totalEnergyCost"));
+ //骞冲潎鐢ㄩ噺
+ energyStatisticsDto.setAverageConsumption(energyStatisticsDto.getTotalEnergyConsumption().divide(new BigDecimal(energyStatisticsVo.getDays()),2, RoundingMode.HALF_UP));
+ //鐜瘮鍙樺寲=(鏈湡鍊� - 涓婃湡鍊�) / 涓婃湡鍊� * 100
+ LocalDate minDays = energyStatisticsVo.getStartDate().minusDays(energyStatisticsVo.getDays());
+ LocalDate masDays = energyStatisticsVo.getEndDate().minusDays(energyStatisticsVo.getDays());
+ EnergyStatisticsVo oldenergyStatisticsVo = new EnergyStatisticsVo();
+ BeanUtils.copyProperties(energyStatisticsVo,oldenergyStatisticsVo);
+ oldenergyStatisticsVo.setStartDate(minDays);
+ oldenergyStatisticsVo.setEndDate(masDays);
+ Map<String, BigDecimal> oldmap=energyConsumptionDetailMapper.calculateEnergy(oldenergyStatisticsVo);
+ if (ObjectUtils.isNotEmpty(oldmap)) {
+ BigDecimal changeVite = (map.get("totalEnergyConsumption").subtract(oldmap.get("totalEnergyConsumption"))).divide(oldmap.get("totalEnergyConsumption"), 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
+ energyStatisticsDto.setChangeVite(changeVite);
+ }
+ //鑳借�楃被鍨嬪崰姣�
+ List<EnergyConsumptionTypeDto> energyConsumptionTypeDtos=energyConsumptionDetailMapper.energyConsumptionTypeProportion(energyStatisticsVo);
+ energyStatisticsDto.setEnergyConsumptionTypeProportion(energyConsumptionTypeDtos);
+ //鑳借�楁槑缁�
+ List<EnergyCostDto> energyCostDtos=energyConsumptionDetailMapper.energyCostDtos(energyStatisticsVo);
+ energyStatisticsDto.setEnergyCostDtos(energyCostDtos);
+ return energyStatisticsDto;
+ }
}
--
Gitblit v1.9.3