From 41f40e898a7ebdbefc8a02b472d58d4689b3e88e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 19:05:05 +0800
Subject: [PATCH] BaseResult替换localDate
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 59aac6f..3a1ea2f 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -16,7 +16,6 @@
<result column="remark" property="remark" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
- <result column="category" property="category" />
<result column="province_tag" property="provinceTag" />
<result column="important_tag" property="importantTag" />
</resultMap>
@@ -40,8 +39,7 @@
typ.create_time,
typ.update_time,
typ.important_tag,
- typ.province_tag,
- typ.category
+ typ.province_tag
FROM
t_yw_point typ
LEFT JOIN t_yw_unit tyu ON typ.unit_id = tyu.id AND tyu.deleted = 0
@@ -55,10 +53,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
]]>
@@ -75,4 +73,28 @@
</if>
</where>
</select>
+
+ <select id="export" resultType="com.ycl.platform.domain.excel.PointExport">
+ SELECT
+ m.name as pointName,
+ m.serial_number,
+ m.ip,
+ 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
+ INNER 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>
+ </select>
+
+ <select id="sumOffTime" resultType="java.lang.Integer">
+ select sum(today_outline_sed) from t_platform_online
+ where create_date between #{startDate} and #{endDate}
+ </select>
</mapper>
--
Gitblit v1.8.0