From 08f82c7545e9bfbe44e507613723e8c458a322d1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 13 三月 2026 13:31:24 +0800
Subject: [PATCH] 能耗统计调整
---
src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml b/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml
index b2cf830..32f2f40 100644
--- a/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml
+++ b/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml
@@ -53,8 +53,8 @@
<select id="energyConsumptionTypeProportion"
resultType="com.ruoyi.energy.dto.EnergyConsumptionTypeDto">
select e.energy_tyep,
- SUM(ecd.dosage) energyConsumption,
- SUM(ecd.dosage * e.unit_price) energyCost
+ SUM(COALESCE(ecd.dosage, 0)) energyConsumption,
+ SUM(COALESCE(ecd.dosage, 0) * e.unit_price) energyCost
from energy_consumption_detail ecd
left join energy e on ecd.energy_id = e.id
where ecd.meter_reading_date between #{c.startDate} and #{c.endDate}
@@ -64,16 +64,17 @@
group by e.energy_tyep
</select>
<select id="energyCostDtos" resultType="com.ruoyi.energy.dto.EnergyCostDto">
- select A.meter_reading_date,
- A.waterConsumption,
- A.waterCost,
- B.electricityConsumption,
- B.electricityCost,
- C.gasConsumption,
- C.gasCost,
- sum(A.waterConsumption+B.electricityConsumption+C.gasConsumption) totalConsumption,
- sum(A.waterCost+B.electricityCost+C.gasCost) totalCost
- from
+ select z.meter_reading_date,
+ COALESCE(A.waterConsumption, 0) waterConsumption,
+ COALESCE(A.waterCost, 0) waterCost,
+ COALESCE(B.electricityConsumption, 0) electricityConsumption,
+ COALESCE(B.electricityCost, 0) electricityCost,
+ COALESCE(C.gasConsumption, 0) gasConsumption,
+ COALESCE(C.gasCost, 0) gasCost,
+ COALESCE(A.waterConsumption, 0)+ COALESCE(B.electricityConsumption, 0)+ COALESCE(C.gasConsumption, 0) totalConsumption,
+ COALESCE(A.waterCost, 0)+ COALESCE(B.electricityCost, 0)+ COALESCE(C.gasCost, 0) totalCost
+ from energy_consumption_detail z
+ left join
(select ecd.meter_reading_date,
sum(ecd.dosage) waterConsumption,
sum(ecd.dosage * e1.unit_price) waterCost
@@ -85,7 +86,8 @@
and ecd.type =#{c.type}
</if>
group by ecd.meter_reading_date)A
- join
+ on z.meter_reading_date=A.meter_reading_date
+ left join
(select ecd.meter_reading_date,
sum(ecd.dosage) electricityConsumption,
sum(ecd.dosage * e2.unit_price) electricityCost
@@ -97,8 +99,8 @@
and ecd.type =#{c.type}
</if>
group by ecd.meter_reading_date)B
- on A.meter_reading_date=B.meter_reading_date
- join
+ on z.meter_reading_date=B.meter_reading_date
+ left join
(select ecd.meter_reading_date,
sum(ecd.dosage) gasConsumption,
sum(ecd.dosage * e3.unit_price) gasCost
@@ -110,8 +112,8 @@
and ecd.type =#{c.type}
</if>
group by ecd.meter_reading_date)C
- on A.meter_reading_date=C.meter_reading_date
-
+ on z.meter_reading_date=C.meter_reading_date
+ order by z.meter_reading_date
</select>
</mapper>
--
Gitblit v1.9.3