From 438e7530cf959f73e40e27386aeb9c7ae3dbbf57 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 20 Nov 2023 18:01:17 +0800
Subject: [PATCH] 大坝安全监控预警列表
---
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
index beb3a96..7faad62 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
@@ -83,14 +83,17 @@
AND NAG.type = #{vo.type}
</if>
<if test="vo.type != null and vo.type !='' and vo.type == 3">
- AND (NAG.type = '3' or NAG.type = '4' or NAG. type = '5')
+ AND (NAG.type = '3' or NAG.type = '4' or NAG.type = '5')
</if>
<if test="vo.pointId != null and vo.pointId !='' ">
AND NAG.POINT_id = #{vo.pointId}
</if>
- <if test="vo.cdName != null and vo.cdName !=''">
+ <if test="vo.cdName != null and vo.cdName !='' and vo.tpe != 3">
AND acb."cd_nm" LIKE CONCAT('%',#{vo.cdName},'%')
</if>
+ <if test="vo.cdName != null and vo.cdName !='' and vo.tpe == 3">
+ AND awcb."cd_nm" LIKE CONCAT('%',#{vo.cdName},'%')
+ </if>
AND NAG.dam_id = #{vo.damId}
ORDER BY NAG."TIME" DESC
)temp
--
Gitblit v1.9.3