From 0f6b12cde24a661f1fa60c6b25a7791ee3424a31 Mon Sep 17 00:00:00 2001
From: Administrator <1923636941@qq.com>
Date: Wed, 28 Jun 2023 21:56:18 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/WaterMeterMonthRecordMapper.xml       | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/water/mapper/xml/WaterMeterMonthRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/water/mapper/xml/WaterMeterMonthRecordMapper.xml
index 94911cb6f..47236d6b0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/water/mapper/xml/WaterMeterMonthRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/water/mapper/xml/WaterMeterMonthRecordMapper.xml
@@ -39,21 +39,21 @@
     <select id="selectWaterMeterMonthRecordByMeterNo" resultType="java.util.Map">
         SELECT a.water_meter_no                                           waterMeterNo,
                IFNULL(b.water_tonnage, 0)                                 endWaterVolume,
-               IFNULL(b.water_tonnage, 0) - IFNULL(c.end_water_volume, 0) useWater,
-               DATE_FORMAT(NOW(), "%Y-%m")                                monthTime,
-               a.project_sn                                               projectSn,
-               IFNULL(c.end_water_volume, 0)                              startWaterVolume
+        IFNULL(b.water_tonnage, 0) - IFNULL(c.end_water_volume, 0) useWater,
+        DATE_FORMAT(NOW(), "%Y-%m") monthTime,
+        a.project_sn projectSn,
+        IFNULL(c.end_water_volume, 0) startWaterVolume
         from water_meter a
-                 LEFT JOIN
-             (SELECT water_meter_no, project_sn, water_tonnage
-              from water_meter_record_detail
-              WHERE water_meter_no = #{waterMeterNo}
-                AND DATE_FORMAT(add_time, "%Y-%m") = DATE_FORMAT(NOW(), "%Y-%m")
-              ORDER BY add_time LIMIT 1) b ON a.water_meter_no = b.water_meter_no
-                 LEFT JOIN (SELECT end_water_volume, water_meter_no
-                            FROM water_meter_month_record
-                            where month_time = DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -2 MONTH), "%Y-%m")
-                              and water_meter_no = #{waterMeterNo}) c ON a.water_meter_no = c.water_meter_no
+        LEFT JOIN
+        (SELECT water_meter_no, project_sn, water_tonnage
+        from water_meter_record_detail
+        WHERE water_meter_no = #{waterMeterNo}
+        AND DATE_FORMAT(add_time, "%Y-%m") = DATE_FORMAT(NOW(), "%Y-%m")
+        ORDER BY add_time desc LIMIT 1) b ON a.water_meter_no = b.water_meter_no
+        LEFT JOIN (SELECT end_water_volume, water_meter_no
+        FROM water_meter_month_record
+        where month_time = DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -1 MONTH), "%Y-%m")
+        and water_meter_no = #{waterMeterNo}) c ON a.water_meter_no = c.water_meter_no
         WHERE a.water_meter_no = #{waterMeterNo}
     </select>