From 4e53338c0c6859a43693f3f690f0c05da888a02e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 11:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/resources/mapper/C3mChargingMapper.xml | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/dao/src/main/resources/mapper/C3mChargingMapper.xml b/dao/src/main/resources/mapper/C3mChargingMapper.xml
index 87cf5a9..f903047 100644
--- a/dao/src/main/resources/mapper/C3mChargingMapper.xml
+++ b/dao/src/main/resources/mapper/C3mChargingMapper.xml
@@ -26,4 +26,36 @@
from c3m_charging
where c3_mac = #{c3Mac}
</select>
+ <select id="listC3mChargingDto" resultType="com.sandu.ximon.dao.bo.C3ChargingBo">
+ SELECT t1.*,
+ t3.id AS pole_id,
+ t3.pole_name
+ FROM c3m_charging t1
+ LEFT JOIN pole_binding t2 ON t1.mcu_udid = t2.device_code
+ AND t2.device_type = 2
+ LEFT JOIN pole t3 ON t3.id = t2.pole_id
+ <where>
+ <if test="keyword != null and keyword != ''">
+ AND (t1.c3_name LIKE CONCAT(CONCAT('%', #{keyword}), '%') OR (t3.pole_name 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