From 33ecbd69aca2ccc58d47f467f3f7266b37fa9dfc Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 18:44:38 +0800
Subject: [PATCH] fix
---
dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml b/dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml
index cf17fb1..28e4b14 100644
--- a/dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml
+++ b/dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml
@@ -38,7 +38,7 @@
<select id="listLed" resultType="com.sandu.ximon.dao.domain.PoleLightemitEntity">
SELECT
t1.*, t2.pole_id as streetlight_id,
- t3.pole_name as streetlight_name, t3.id
+ t3.pole_name as streetlight_name, t3.id
FROM
pole_lightemit t1
LEFT JOIN pole_binding t2 ON t1.lightemit_control_code = t2.device_code
@@ -46,9 +46,9 @@
LEFT JOIN pole t3 ON t3.id = t2.pole_id
<where>
<if test="keyword != null and keyword != ''">
- AND t1.lightemit_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
+ AND (t1.lightemit_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
OR t1.lightemit_control_code LIKE CONCAT(CONCAT('%', #{keyword}), '%')
- OR t1.lightemit_id LIKE CONCAT(CONCAT('%', #{keyword}), '%')
+ OR t1.lightemit_id LIKE CONCAT(CONCAT('%', #{keyword}), '%'))
</if>
<if test="userid != null">
AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
@@ -71,4 +71,23 @@
AND t3.lightemit_control_code = #{lightemitControlCode}
</if>
</select>
+ <select id="listLedOnBinding" resultType="com.sandu.ximon.dao.domain.PoleLightemitEntity">
+ SELECT
+ t1.*, t2.pole_id as streetlight_id,
+ t3.pole_name as streetlight_name, t3.id
+ FROM
+ pole_lightemit t1
+ LEFT JOIN pole_binding t2 ON t1.lightemit_control_code = t2.device_code
+ AND t2.device_type = 10
+ LEFT JOIN pole t3 ON t3.id = t2.pole_id
+ <where>
+ <if test="keyword != null and keyword != ''">
+ AND (t1.lightemit_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
+ OR t1.lightemit_control_code LIKE CONCAT(CONCAT('%', #{keyword}), '%'))
+ </if>
+ <if test="userid != null">
+ AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
+ </if>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.9.3