From 7e6836f99b10cde552d2f403009bf66082535d94 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 02 四月 2026 11:58:33 +0800
Subject: [PATCH] fix: 生产统计看板能耗统计单位
---
src/main/java/com/ruoyi/home/dto/HomeEnergyStatisticsDto.java | 9 +++++++++
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 18 +++++++++++++++++-
2 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/dto/HomeEnergyStatisticsDto.java b/src/main/java/com/ruoyi/home/dto/HomeEnergyStatisticsDto.java
index 4f598df..9cf01e4 100644
--- a/src/main/java/com/ruoyi/home/dto/HomeEnergyStatisticsDto.java
+++ b/src/main/java/com/ruoyi/home/dto/HomeEnergyStatisticsDto.java
@@ -29,4 +29,13 @@
@ApiModelProperty("钂告苯")
private BigDecimal steam = BigDecimal.ZERO;
+ @ApiModelProperty("姘村崟浣�")
+ private String waterUnit;
+
+ @ApiModelProperty("鐢靛崟浣�")
+ private String electricityUnit;
+
+ @ApiModelProperty("钂告苯鍗曚綅")
+ private String steamUnit;
+
}
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index 621276d..1df045f 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -58,8 +58,10 @@
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.stock.mapper.StockInventoryMapper;
-import com.ruoyi.energy.mapper.EnergyConsumptionDetailMapper;
+import com.ruoyi.energy.mapper.EnergyMapper;
+import com.ruoyi.energy.pojo.Energy;
import com.ruoyi.energy.dto.EnergyCostDto;
+import com.ruoyi.energy.mapper.EnergyConsumptionDetailMapper;
import com.ruoyi.energy.vo.EnergyStatisticsVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -158,6 +160,10 @@
@Autowired
private SalesDeliveryMapper salesDeliveryMapper;
+
+ @Autowired
+ private EnergyMapper energyMapper;
+
@Override
public HomeBusinessDto business() {
@@ -3405,6 +3411,13 @@
}
if (!CollectionUtils.isEmpty(costDtos)) {
+ // 鑾峰彇鍗曚綅
+ List<Energy> energies = energyMapper.selectList(Wrappers.<Energy>lambdaQuery()
+ .in(Energy::getEnergyTyep, Arrays.asList("姘�", "鐢�", "姘�")));
+ String waterUnit = energies.stream().filter(e -> "姘�".equals(e.getEnergyTyep())).map(Energy::getUnit).findFirst().orElse("");
+ String electricityUnit = energies.stream().filter(e -> "鐢�".equals(e.getEnergyTyep())).map(Energy::getUnit).findFirst().orElse("");
+ String steamUnit = energies.stream().filter(e -> "姘�".equals(e.getEnergyTyep())).map(Energy::getUnit).findFirst().orElse("");
+
for (EnergyCostDto costDto : costDtos) {
String dateStr = costDto.getMeterReadingDate();
String label = "";
@@ -3427,6 +3440,9 @@
dayDto.setWater(water);
dayDto.setElectricity(electricity);
dayDto.setSteam(steam);
+ dayDto.setWaterUnit(waterUnit);
+ dayDto.setElectricityUnit(electricityUnit);
+ dayDto.setSteamUnit(steamUnit);
}
}
}
--
Gitblit v1.9.3