From 95b6c442989442750fc2fb85869523678adcd698 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 07 八月 2024 09:35:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 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..031607d 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -75,4 +75,22 @@
</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
+ 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>
+
</mapper>
--
Gitblit v1.8.0