From 05477e22f0ca3b17ca8a5a2996e539f3cd5cc1a9 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 01 十一月 2024 15:06:12 +0800
Subject: [PATCH] 2024-11-01 修复整点报历史记录总数量错误的bug

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
index c3afb26..3735f0e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
@@ -200,13 +200,13 @@
     SELECT
         COUNT(*) AS recordCount
     FROM rm_on_hour_report_history oh
-    INNER JOIN pr_intake inta ON inta.id = oh.intake_id
+        INNER JOIN pr_intake inta ON inta.id = oh.intake_id
     <where>
       <if test="intakeId != null and intakeId >0">
         AND oh.intake_id = #{intakeId}
       </if>
-      <if test = "intakeName != null and intakeName !=''">
-        AND inta.name LIKE CONCAT('%',#{intakeName},'%')
+      <if test = "intakeNum != null and intakeNum !=''">
+        AND inta.name LIKE CONCAT('%',#{intakeNum},'%')
       </if>
       <if test = "rtuAddr != null and rtuAddr !=''">
         AND oh.rtu_addr LIKE CONCAT('%',#{rtuAddr},'%')
@@ -260,8 +260,15 @@
     SELECT
         COUNT(*) AS recordCount
     FROM pr_intake inta
-        LEFT JOIN (SELECT * FROM rm_on_hour_report_history WHERE dt BETWEEN #{timeStart} AND #{timeStop}) his ON his.intake_id = inta.id
-        INNER JOIN ba_block blo ON blo.id = inta.blockId
+    LEFT JOIN
+         (SELECT * FROM rm_on_hour_report_history
+         <where>
+           <if test = "timeStart != null and timeStop != null">
+           dt BETWEEN #{timeStart} AND #{timeStop}
+           </if>
+         </where>) his
+         ON his.intake_id = inta.id
+    INNER JOIN ba_block blo ON blo.id = inta.blockId
     WHERE his.intake_id IS NULL AND inta.deleted = 0
 
   </select>
@@ -273,8 +280,15 @@
       inta.name AS intakeNum,
       blo.name AS blockName
     FROM pr_intake inta
-           LEFT JOIN (SELECT * FROM rm_on_hour_report_history WHERE dt BETWEEN #{timeStart} AND #{timeStop}) his ON his.intake_id = inta.id
-           INNER JOIN ba_block blo ON blo.id = inta.blockId
+    LEFT JOIN
+    (SELECT * FROM rm_on_hour_report_history
+    <where>
+      <if test = "timeStart != null and timeStop != null">
+        dt BETWEEN #{timeStart} AND #{timeStop}
+      </if>
+    </where>) his
+    ON his.intake_id = inta.id
+    INNER JOIN ba_block blo ON blo.id = inta.blockId
     WHERE his.intake_id IS NULL AND inta.deleted = 0
     ORDER BY inta.id
     <trim prefix="limit " >
@@ -283,8 +297,8 @@
       </if>
     </trim>
   </select>
-  <!--鎸囧畾鏃堕棿娈靛唴鐢ㄦ按閲忚秴杩囨寚瀹氬�肩殑鍙栨按鍙ｆ暟閲�-->
-  <select id="getUseWaterGtValueIntakesCount" resultType="java.lang.Long">
+  <!--鎸囧畾鏃堕棿娈靛唴绱Н娴侀噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙ｆ暟閲�-->
+  <select id="getTotalFlowGtValueIntakesCount" resultType="java.lang.Long">
     select
     count(*)
     from
@@ -316,8 +330,8 @@
     WHERE IFNULL(b.total_amount, 0)-IFNULL(a.total_amount, 0) &gt; #{value} AND inta.deleted = 0
     ) c
     </select>
-  <!--鎸囧畾鏃堕棿娈靛唴鐢ㄦ按閲忚秴杩囨寚瀹氬�肩殑鍙栨按鍙�-->
-  <select id="getUseWaterGtValueIntakes" resultType="com.dy.pipIrrGlobal.voSt.VoIntakeAccumulateAmount">
+  <!--鎸囧畾鏃堕棿娈靛唴绱Н娴侀噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�-->
+  <select id="getTotalFlowGtValueIntakes" resultType="com.dy.pipIrrGlobal.voSt.VoIntakeAccumulateAmount">
     SELECT
       inta.id AS intakeId,
       inta.NAME AS intakeNum,

--
Gitblit v1.8.0