From 2a0a87b0cc877ecc6fc2ffcff26ff0cbf26ff2ef Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 09 八月 2024 17:06:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index c57534a..28f53bf 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -18,6 +18,7 @@
<result column="update_time" property="updateTime" />
<result column="province_tag" property="provinceTag" />
<result column="important_tag" property="importantTag" />
+ <result column="important_command_image_tag" property="importantCommandImageTag" />
</resultMap>
<select id="selectData" resultType="com.ycl.platform.base.BaseSelect">
@@ -39,7 +40,8 @@
typ.create_time,
typ.update_time,
typ.important_tag,
- typ.province_tag
+ typ.province_tag,
+ typ.important_command_image_tag
FROM
t_yw_point typ
LEFT JOIN t_yw_unit tyu ON typ.unit_id = tyu.id AND tyu.deleted = 0
@@ -53,10 +55,10 @@
<select id="home" resultType="com.ycl.platform.domain.entity.YwPoint">
<![CDATA[
- SELECT id, point_name, start_time, end_time, status
+ SELECT t_yw_point.id, point_name, start_time, end_time, status, unit_name AS remark
FROM t_yw_point
- WHERE
- deleted = 0
+ LEFT JOIN t_yw_unit ON t_yw_unit.id = t_yw_point.unit_id AND t_yw_point.deleted = 0
+ WHERE t_yw_point.deleted = 0
AND TIMESTAMPDIFF(MONTH, NOW(), end_time) <= (SELECT config_value FROM sys_config WHERE config_key = 'operation.and.maintenance.expiration.warning.time')
ORDER BY end_time
]]>
@@ -65,10 +67,10 @@
<select id="selectByTag" resultType="com.ycl.platform.domain.entity.YwPoint">
select * from t_yw_point
<where>
- <if test="important!=null and important!= '' ">
+ <if test="important!=null and important == true ">
and important_tag = #{important}
</if>
- <if test="province!=null and province!= '' ">
+ <if test="province!=null and province == true ">
and province_tag = #{province}
</if>
</where>
@@ -81,7 +83,10 @@
m.ip,
yu.unit_name,
yp.start_time,
- yp.end_time
+ yp.end_time,
+ yp.province_tag,
+ yp.important_tag,
+ yp.important_command_image_tag
FROM
t_yw_point yp
INNER JOIN t_monitor m ON yp.serial_number = m.serial_number
@@ -92,5 +97,4 @@
</if>
</where>
</select>
-
</mapper>
--
Gitblit v1.8.0