From a142426be35316fbfa317670fb4137a5848d4883 Mon Sep 17 00:00:00 2001 From: jiang Date: Thu, 24 Jul 2025 23:13:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E8=83=BD=E5=87=8F=E6=8E=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/DeviceEnergyAnalysisMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DeviceEnergyAnalysisMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DeviceEnergyAnalysisMapper.xml index 03bab3e..a3dc727 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DeviceEnergyAnalysisMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DeviceEnergyAnalysisMapper.xml @@ -10,7 +10,8 @@ SUM(consumption_kwh) AS consumptionKwh, SUM(renewable_used_kwh * 0.9) AS renewableUsedKwh FROM device_energy_analysis - WHERE stat_date BETWEEN #{startDate} AND #{endDate} + WHERE stat_date >= #{startDate} + AND stat_date < DATE_ADD(#{endDate}, INTERVAL 1 DAY) and pro_id = #{proId} GROUP BY DATE(stat_date) ORDER BY statDate ASC