From e059d06932a35d26be1c030dce61964bd04a1488 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 09 一月 2025 16:41:35 +0800
Subject: [PATCH] 优化”最近未上报数据“功能实现

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
index aa0f4a0..efdb807 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -1074,8 +1074,8 @@
         IFNULL(SUM(rocvh.cl_this_time),0) AS recordCount
         FROM
         pr_intake inta
-        INNER JOIN ba_block blo ON blo.id = inta.blockId
-        LEFT JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
+        LEFT JOIN ba_block blo ON blo.id = inta.blockId
+        INNER JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
         WHERE rocvh.op_dt &gt;= #{timeStart} AND rocvh.cl_dt &lt;= #{timeStop} AND inta.deleted = 0
         GROUP BY inta.id
         HAVING IFNULL(SUM(rocvh.cl_this_time),0) &gt; #{value}
@@ -1094,9 +1094,9 @@
             inta.id AS intakeId
             FROM
             pr_intake inta
-            INNER JOIN ba_block blo ON blo.id = inta.blockId
-            inner JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
-            WHERE inta.deleted = 0 AND rocvh.id >= #{idStart} AND  rocvh.id >= #{idEnd} AND rocvh.cl_dt IS NULL
+            LEFT JOIN ba_block blo ON blo.id = inta.blockId
+            INNER JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
+            WHERE inta.deleted = 0 AND rocvh.id <![CDATA[>=]]> #{idStart} AND  rocvh.id <![CDATA[<=]]> #{idEnd} AND rocvh.cl_dt IS NULL
             GROUP BY inta.id
         ) c
     </select>
@@ -1110,9 +1110,9 @@
             blo.NAME AS blockName
         FROM
             pr_intake inta
-            INNER JOIN ba_block blo ON blo.id = inta.blockId
-            inner JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
-        WHERE inta.deleted = 0 AND rocvh.id >= #{idStart} AND  rocvh.id >= #{idEnd} AND rocvh.cl_dt IS NULL
+            LEFT JOIN ba_block blo ON blo.id = inta.blockId
+            INNER JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
+        WHERE inta.deleted = 0 AND rocvh.id <![CDATA[>=]]> #{idStart} AND  rocvh.id <![CDATA[<=]]> #{idEnd} AND rocvh.cl_dt IS NULL
         GROUP BY inta.id
         ORDER BY inta.id DESC
         <trim prefix="limit ">
@@ -1129,9 +1129,9 @@
             inta.id AS intakeId
             FROM
             pr_intake inta
-            INNER JOIN ba_block blo ON blo.id = inta.blockId
-            inner JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
-            WHERE inta.deleted = 0 AND rocvh.id >= #{idStart} AND  rocvh.id >= #{idEnd} AND rocvh.op_dt IS NULL
+            LEFT JOIN ba_block blo ON blo.id = inta.blockId
+            INNER JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
+            WHERE inta.deleted = 0 AND rocvh.id <![CDATA[>=]]> #{idStart} AND  rocvh.id <![CDATA[<=]]> #{idEnd} AND rocvh.op_dt IS NULL
             GROUP BY inta.id
         ) c
     </select>
@@ -1145,9 +1145,9 @@
         blo.NAME AS blockName
         FROM
         pr_intake inta
-        INNER JOIN ba_block blo ON blo.id = inta.blockId
-        inner JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
-        WHERE inta.deleted = 0 AND rocvh.id >= #{idStart} AND  rocvh.id >= #{idEnd} AND rocvh.op_dt IS NULL
+        LEFT JOIN ba_block blo ON blo.id = inta.blockId
+        INNER JOIN rm_open_close_valve_history rocvh ON rocvh.intake_id = inta.id
+        WHERE inta.deleted = 0 AND rocvh.id <![CDATA[>=]]> #{idStart} AND  rocvh.id <![CDATA[<=]]> #{idEnd} AND rocvh.op_dt IS NULL
         GROUP BY inta.id
         ORDER BY inta.id DESC
         <trim prefix="limit ">

--
Gitblit v1.8.0