From 45d5b8bdbe5407b88cc324fdbcbcbaa51b7ab64c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 07 八月 2024 16:36:49 +0800
Subject: [PATCH] 点位时间优化
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 1bbc828..39dcac3 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -17,7 +17,8 @@
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<result column="category" property="category" />
- <result column="point_tag" property="pointTagString" />
+ <result column="province_tag" property="provinceTag" />
+ <result column="important_tag" property="importantTag" />
</resultMap>
<select id="selectData" resultType="com.ycl.platform.base.BaseSelect">
@@ -28,7 +29,6 @@
SELECT
typ.id,
typ.point_name,
- typ.point_tag,
typ.start_time,
typ.end_time,
typ.unit_id,
@@ -39,7 +39,8 @@
typ.remark,
typ.create_time,
typ.update_time,
- typ.point_tag,
+ typ.important_tag,
+ typ.province_tag,
typ.category
FROM
t_yw_point typ
@@ -54,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
]]>
@@ -67,10 +68,10 @@
select * from t_yw_point
<where>
<if test="important!=null and important!= '' ">
- and point_tag like concat('%', #{important}, '%')
+ and important_tag = #{important}
</if>
<if test="province!=null and province!= '' ">
- and point_tag like concat('%', #{province}, '%')
+ and province_tag = #{province}
</if>
</where>
</select>
@@ -80,7 +81,9 @@
m.name as pointName,
m.serial_number,
m.ip,
- yu.unit_name
+ yu.unit_name,
+ yp.start_time,
+ yp.end_time
FROM
t_yw_point yp
INNER JOIN t_monitor m ON yp.serial_number = m.serial_number
--
Gitblit v1.8.0