From 474ba1ebf60b9ffc28274437e75cab8a6c4663e9 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 04 Nov 2023 17:22:38 +0800
Subject: [PATCH] 位移测点名称修改
---
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 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 62e53fc..d274aa7 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
@@ -42,20 +42,23 @@
</if>
AND dam_id = #{vo.damId}
</select>
+
<select id="getAlarmDetailPage" resultType="cn.gistack.nky.vo.AlarmGetVO">
+ SELECT temp.*,awcb."cd_nm" as cdWyName FROM
+ (
SELECT
- NAG.ID,
- NAG.DAM_ID,
- NAG.POINT_ID,
- acb."cd_nm" as cdName,
- NAG.TYPE,
- (
- CASE
- WHEN NAG.TYPE=1 THEN '渗压'
- WHEN NAG.TYPE=2 THEN '渗流'
- WHEN (NAG.TYPE=3 OR NAG.TYPE=4 OR NAG.TYPE=5) THEN '位移'
- END) AS typeName,
- NAG."TIME",NAG."VALUE",NAG."DESC",NAG.CREATE_TIME,NAG.TASK_CATEGORY,NAG."LEVEL",NAG.BAOJINGZHI,NAG.ORIGIN_ID,
+ NAG.ID,
+ NAG.DAM_ID,
+ NAG.POINT_ID,
+ acb."cd_nm" as cdName,
+ NAG.TYPE,
+ (
+ CASE
+ WHEN NAG.TYPE=1 THEN '渗压'
+ WHEN NAG.TYPE=2 THEN '渗流'
+ WHEN (NAG.TYPE=3 OR NAG.TYPE=4 OR NAG.TYPE=5) THEN '位移'
+ END) AS typeName,
+ NAG."TIME",NAG."VALUE",NAG."DESC",NAG.CREATE_TIME,NAG.TASK_CATEGORY,NAG."LEVEL",NAG.BAOJINGZHI,NAG.ORIGIN_ID,
NAG.FORWARD,NAG."REVERSE",NAG.RATIO,NAG.STATUS
FROM YWXT.NKY_ALARM_GET NAG
@@ -80,7 +83,7 @@
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' orNAG. 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}
@@ -89,5 +92,11 @@
AND acb."cd_nm" LIKE CONCAT('%',#{vo.cdName},'%')
</if>
AND NAG.dam_id = #{vo.damId}
+ ORDER BY NAG."time" DESC
+ )temp
+ LEFT JOIN SJZT_MD."att_wy_cd_base" awcb ON awcb."res_cd" = temp.DAM_ID AND temp.POINT_ID = awcb."cd"
+
+
+
</select>
</mapper>
--
Gitblit v1.9.3