From ac57d8b3ab2a6e248d1a099b5acac9cb40c19cca Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 09 一月 2025 15:03:19 +0800
Subject: [PATCH] 优代SQL

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 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 3e73532..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,8 +1094,8 @@
             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
+            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
@@ -1110,8 +1110,8 @@
             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
+            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
@@ -1129,8 +1129,8 @@
             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
+            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
@@ -1145,8 +1145,8 @@
         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
+        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

--
Gitblit v1.8.0