From cc623a1a25fe1861fbeaba79a76bfc29724141f9 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 01 九月 2024 14:52:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index ed1861a..3991a87 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -19,6 +19,7 @@
<result column="province_tag" property="provinceTag"/>
<result column="important_tag" property="importantTag"/>
<result column="important_command_image_tag" property="importantCommandImageTag"/>
+ <result column="dept_tag" property="deptTag"/>
</resultMap>
<select id="selectData" resultType="com.ycl.platform.base.BaseSelect">
@@ -41,7 +42,8 @@
typ.update_time,
typ.important_tag,
typ.province_tag,
- typ.important_command_image_tag
+ typ.important_command_image_tag,
+ typ.dept_tag
FROM
t_yw_point typ
LEFT JOIN t_yw_unit tyu ON typ.unit_id = tyu.id AND tyu.deleted = 0
@@ -78,6 +80,9 @@
<if test="commandImage!=null and commandImage == true ">
and important_command_image_tag = #{commandImage}
</if>
+ <if test="deptTag !=null and deptTag == true ">
+ and dept_tag = #{deptTag}
+ </if>
</where>
</select>
@@ -89,17 +94,46 @@
yu.unit_name,
yp.start_time,
yp.end_time,
- yp.province_tag,
- yp.important_tag,
- yp.important_command_image_tag
+ 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.dept_tag = 0 THEN '鍚�' ELSE '鏄�' END AS deptTag
FROM
t_yw_point yp
INNER JOIN t_monitor m ON yp.serial_number = m.serial_number
- INNER JOIN t_yw_unit yu ON yu.id = yp.unit_id
+ LEFT JOIN t_yw_unit yu ON yu.id = yp.unit_id
<where>
<if test="query.pointName != null and query.pointName != ''">
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>
+ <if test="point.unitId != null">
+ unit_id = #{point.unitId},
+ </if>
+ <if test="point.startTime != null">
+ start_time = #{point.startTime},
+ </if>
+ <if test="point.endTime != null">
+ end_time = #{point.endTime},
+ </if>
+ province_tag = #{point.provinceTag},
+ important_command_image_tag = #{point.importantCommandImageTag},
+ dept_tag = #{point.deptTag}
+ WHERE serial_number = #{point.serialNumber}
+ </foreach>
+ </update>
</mapper>
--
Gitblit v1.8.0