From bb6aeccaad6a7bdf842828d6fb11f3fb61be76eb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 28 三月 2026 15:08:56 +0800
Subject: [PATCH] 关于能耗的统计调整2.0
---
src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml b/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml
index 9feaab6..4540963 100644
--- a/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml
+++ b/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml
@@ -67,7 +67,8 @@
group by e.energy_tyep
</select>
<select id="energyCostDtos1" resultType="com.ruoyi.energy.dto.EnergyCostDto">
- select z.meter_reading_date,
+ select distinct
+ z.meter_reading_date,
COALESCE(A.waterConsumption, 0) waterConsumption,
COALESCE(A.waterCost, 0) waterCost,
COALESCE(B.electricityConsumption, 0) electricityConsumption,
@@ -119,7 +120,8 @@
order by z.meter_reading_date
</select>
<select id="energyCostDtos2" resultType="com.ruoyi.energy.dto.EnergyCostDto">
- select DATE_FORMAT(z.meter_reading_date, '%Y-%m') AS meterReadingDate ,
+ select distinct
+ DATE_FORMAT(z.meter_reading_date, '%Y-%m') AS meterReadingDate ,
COALESCE(A.waterConsumption, 0) waterConsumption,
COALESCE(A.waterCost, 0) waterCost,
COALESCE(B.electricityConsumption, 0) electricityConsumption,
@@ -171,7 +173,8 @@
order by DATE_FORMAT(z.meter_reading_date, '%Y-%m')
</select>
<select id="energyCostDtos3" resultType="com.ruoyi.energy.dto.EnergyCostDto">
- select DATE_FORMAT(z.meter_reading_date, '%Y') AS meterReadingDate,
+ select distinct
+ DATE_FORMAT(z.meter_reading_date, '%Y') AS meterReadingDate,
COALESCE(A.waterConsumption, 0) waterConsumption,
COALESCE(A.waterCost, 0) waterCost,
COALESCE(B.electricityConsumption, 0) electricityConsumption,
@@ -222,8 +225,9 @@
on DATE_FORMAT(z.meter_reading_date, '%Y')=C.meterReadingDate
order by DATE_FORMAT(z.meter_reading_date, '%Y')
</select>
- <select id="energyConsumptionDetailDtos1" resultType="com.ruoyi.energy.dto.EnergyConsumptionDetailDto">
- select ecd.meter_reading_date,
+ <select id="energyConsumptionDetailDtos1" resultType="com.ruoyi.energy.dto.EnergyDetailDto">
+ select distinct
+ ecd.meter_reading_date,
e.energy_tyep,
ecd.type,
e.unit,
@@ -240,8 +244,9 @@
e.unit_price
order by ecd.meter_reading_date
</select>
- <select id="energyConsumptionDetailDtos2" resultType="com.ruoyi.energy.dto.EnergyConsumptionDetailDto">
- select DATE_FORMAT(ecd.meter_reading_date, '%Y-%m') AS meterReadingDate ,
+ <select id="energyConsumptionDetailDtos2" resultType="com.ruoyi.energy.dto.EnergyDetailDto">
+ select distinct
+ DATE_FORMAT(ecd.meter_reading_date, '%Y-%m') AS meterReadingDate ,
e.energy_tyep,
ecd.type,
e.unit,
@@ -258,8 +263,9 @@
e.unit_price
order by DATE_FORMAT(ecd.meter_reading_date, '%Y-%m')
</select>
- <select id="energyConsumptionDetailDtos3" resultType="com.ruoyi.energy.dto.EnergyConsumptionDetailDto">
- select DATE_FORMAT(ecd.meter_reading_date, '%Y') AS meterReadingDate,
+ <select id="energyConsumptionDetailDtos3" resultType="com.ruoyi.energy.dto.EnergyDetailDto">
+ select distinct
+ DATE_FORMAT(ecd.meter_reading_date, '%Y') AS meterReadingDate,
e.energy_tyep,
ecd.type,
e.unit,
--
Gitblit v1.9.3