From 905d9597a05661371c1b69e9126bb89ed0798214 Mon Sep 17 00:00:00 2001
From: FCD <2453864257@qq.com>
Date: Fri, 19 Dec 2025 10:51:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=B5=E9=87=8F=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/report/ReportPointDnbMapper.xml     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml
index bc40f961f..4e9d9d6ad 100644
--- a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml
+++ b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml
@@ -125,15 +125,16 @@
     <select id="energyConsumptionReportByTime" resultType="java.util.Map">
         SELECT
             month_tag AS pointTime,
-            MAX(meter_value) - MIN(meter_value) expend
+            CASE WHEN #{timeSub} != 13 THEN MAX ( meter_value ) - MIN ( meter_value ) ELSE MAX(expend) END expend
         FROM
         (
             SELECT
                 rpd.meter_value,
                 rpd.monitor_id,
-                FORMAT ( rpd.record_time, 'yyyy-MM' ) AS month_tag,
-                ROW_NUMBER ( ) OVER ( PARTITION BY FORMAT ( rpd.record_time, 'yyyy-MM' ), rpd.monitor_id ORDER BY rpd.record_time ASC ) AS rn_asc,
-                ROW_NUMBER ( ) OVER ( PARTITION BY FORMAT ( rpd.record_time, 'yyyy-MM' ), rpd.monitor_id ORDER BY rpd.record_time DESC ) AS rn_desc
+                rpd.expend,
+                left(CONVERT(VARCHAR(19), rpd.begin_time, 120), #{timeSub}) AS month_tag,
+                ROW_NUMBER ( ) OVER ( PARTITION BY left(CONVERT(VARCHAR(19), rpd.begin_time, 120), #{timeSub}), rpd.monitor_id ORDER BY rpd.record_time ASC ) AS rn_asc,
+                ROW_NUMBER ( ) OVER ( PARTITION BY left(CONVERT(VARCHAR(19), rpd.begin_time, 120), #{timeSub}), rpd.monitor_id ORDER BY rpd.record_time DESC ) AS rn_desc
             FROM report_point_dnb rpd
             LEFT JOIN base_monitor_info m ON m.monitor_id = rpd.monitor_id
             <where>