From f47ca83956575f49572a6f20166d98b7ca7af2fb Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 28 八月 2024 17:55:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 572000a..3578040 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -89,9 +89,9 @@
yu.unit_name,
yp.start_time,
yp.end_time,
- CASE WHEN yp.province_tag = 0 THEN '' ELSE '鐪佸巺鐐逛綅' END AS provinceTagString,
- CASE WHEN yp.important_tag = 0 THEN '' ELSE '閲嶇偣鐐逛綅' END AS importantTagString,
- CASE WHEN yp.important_command_image_tag = 0 THEN '' ELSE '閲嶇偣鎸囨尌鍥惧儚' END AS importantCommandImageTagString
+ CASE WHEN yp.province_tag = 0 THEN '鍚�' ELSE '鏄�' END AS provinceTagString,
+ CASE WHEN yp.important_tag = 0 THEN '鍚�' ELSE '鏄�' END AS importantTagString,
+ CASE WHEN yp.important_command_image_tag = 0 THEN '鍚�' ELSE '鏄�' END AS importantCommandImageTagString
FROM
t_yw_point yp
INNER JOIN t_monitor m ON yp.serial_number = m.serial_number
@@ -101,9 +101,26 @@
AND m.name like concat('%', #{query.pointName} ,'%')
</if>
</where>
+ ORDER BY yu.unit_name
</select>
<delete id="deleteAll">
delete from t_yw_point
</delete>
+
+ <update id="updatePoint">
+ <foreach collection="pointList" separator=";" item="point">
+ UPDATE t_yw_point
+ SET
+ <if test="point.pointName != null and point.pointName != ''">
+ point_name = #{point.pointName},
+ </if>
+ unit_id = #{point.unitId},
+ start_time = #{point.startTime},
+ end_time = #{point.endTime},
+ province_tag = #{point.provinceTag},
+ important_command_image_tag = #{point.importantCommandImageTag}
+ WHERE serial_number = #{point.serialNumber}
+ </foreach>
+ </update>
</mapper>
--
Gitblit v1.8.0