From 36408d9db9eac77ea780f97822c3a5ccc630c44b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 09 一月 2025 13:59:54 +0800
Subject: [PATCH] 修改sql中的bug
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 0728c4a..3e73532 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -605,6 +605,8 @@
SELECT COUNT(*) AS recordCount,
inta.id AS intakeId,
inta.name AS intakeNum,
+ inta.lng AS lng,
+ inta.lat AS lat,
blo.name AS blockName
FROM pr_intake inta
LEFT JOIN(SELECT intake_id
@@ -645,6 +647,8 @@
SELECT COUNT(*) AS recordCount,
inta.id AS intakeId,
inta.name AS intakeNum,
+ inta.lng AS lng,
+ inta.lat AS lat,
blo.name AS blockName
FROM pr_intake inta
LEFT JOIN(SELECT intake_id
@@ -1092,7 +1096,7 @@
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
+ 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>
@@ -1108,7 +1112,7 @@
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
+ 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 ">
@@ -1127,7 +1131,7 @@
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
+ 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>
@@ -1143,7 +1147,7 @@
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
+ 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