From d2d069b2fdb68b37c9f850b9798882d383c2fd51 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 11:42:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 6775baf..c52b4b0 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -89,7 +89,7 @@
</foreach>
</select>
- <select id="selectByNumbers" resultType="com.ycl.platform.domain.vo.TMonitor">
+ <select id="selectByNumbers" resultType="com.ycl.platform.domain.entity.TMonitor">
select * from t_monitor where serial_number in
<foreach collection="numbers" separator="," open="(" close=")" item="number">
#{number}
@@ -508,10 +508,14 @@
#{query.keyword} as keyword
FROM
t_monitor tm
+ INNER JOIN t_yw_point yp ON yp.serial_number = tm.serial_number
<where>
<if test="query.keyword != null and query.keyword != ''">
AND tm.name like concat('%', #{query.keyword}, '%')
</if>
+ <if test="query.startTIme != null and query.endTime != null">
+ AND yp.create_time between #{query.startTime} and #{query.endTime}
+ </if>
</where>
</select>
--
Gitblit v1.8.0