From d8f7aad48d36ef47ab97c155a014e00c52533fd5 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 24 十月 2024 10:19:21 +0800
Subject: [PATCH] ”远程监测“功能查询在线取水口和不在线取水口SQL语句修改
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index e9e854e..d273a11 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -546,7 +546,7 @@
<if test="isOnLine != null and isOnLine == false">
<choose>
<when test="onLineMap != null and onLineMap !=''">
- AND rtus.isOnLine = false OR rtus.rtuAddr IS NULL
+ AND (rtus.isOnLine = false OR rtus.rtuAddr IS NULL)
</when>
<otherwise>
AND rtus.rtuAddr IS NULL
@@ -571,6 +571,9 @@
inta.lng,
inta.lat,
IFNULL(hou.total_amount, 0) AS totalAmount,
+ <if test="onLineMap != null and onLineMap !='' and isOnLine != null">
+ rtus.isOnLine,
+ </if>
alarm.alarm
FROM pr_intake inta
INNER JOIN pr_controller con ON con.intakeId = inta.id
@@ -601,7 +604,7 @@
<if test="isOnLine != null and isOnLine == false">
<choose>
<when test="onLineMap != null and onLineMap !=''">
- AND rtus.isOnLine = false OR rtus.rtuAddr IS NULL
+ AND (rtus.isOnLine = false OR rtus.rtuAddr IS NULL)
</when>
<otherwise>
AND rtus.rtuAddr IS NULL
--
Gitblit v1.8.0