From 11f902d3bd73af3902cda568972a503091ab8752 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 三月 2026 17:06:32 +0800
Subject: [PATCH] 能耗成本核算---按日月汇总统计调整
---
src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml b/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml
index 227474c..cbbbd18 100644
--- a/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml
+++ b/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml
@@ -118,19 +118,12 @@
on z.meter_reading_date=C.meter_reading_date
order by z.meter_reading_date
</select>
- <select id="energyAccountTypeDtos" resultType="com.ruoyi.energy.dto.EnergyAccountTypeDto">
- select ecd.type energyAccountType,
- SUM(COALESCE(ecd.dosage, 0) * e.unit_price) energyAccount
- 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}
- group by ecd.type
- </select>
<select id="energyConsumptionDetailDtos"
resultType="com.ruoyi.energy.dto.EnergyConsumptionDetailDto">
select ecd.meter_reading_date,
e.energy_tyep,
ecd.type,
+ e.unit,
e.unit_price,
sum(ecd.dosage) dosage,
sum(ecd.dosage * e.unit_price) cost
@@ -140,6 +133,7 @@
group by ecd.meter_reading_date,
e.energy_tyep,
ecd.type,
+ e.unit,
e.unit_price
order by ecd.meter_reading_date
</select>
--
Gitblit v1.9.3