dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

控制查询条件加模糊查询

Browse Source
This commit is contained in:
chenyouting
2025-10-08 11:48:05 +08:00
parent e1ac87e5f2
commit 6a6397da23
3 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
View File

@ -268,10 +268,10 @@
and a.device_name like concat('%', #{criteria.deviceName}, '%')
</if>
<if test="criteria.deviceImei != null and criteria.deviceImei != ''">
and a.device_imei = #{criteria.deviceImei}
and a.device_imei like concat('%',#{criteria.deviceImei}, '%')
</if>
<if test="criteria.content != null and criteria.content != ''">
AND (a.device_imei = #{criteria.content} or a.device_mac = #{criteria.content})
AND (a.device_imei like concat('%',#{criteria.content}, '%') or a.device_mac like concat('%',#{criteria.content}, '%') )
</if>
<if test="criteria.deviceStatus != null">
and a.device_status = #{criteria.deviceStatus}
@ -288,7 +288,7 @@
<if test="criteria.onlineStatus != null">
and a.online_status = #{criteria.onlineStatus}
</if>
ORDER BY a.binding_time DESC
ORDER BY a.online_status,a.binding_time DESC
</select>
<select id="getLocationHistory" resultType="com.fuyuanshen.equipment.domain.vo.LocationHistoryVo">
select a.id,a.device_name,a.device_type,b.type_name deviceTypeName,a.device_imei,a.device_mac from device a
@ -304,10 +304,10 @@
AND a.device_mac = #{bo.deviceMac}
</if>
<if test="bo.deviceImei != null and bo.deviceImei != ''">
AND a.device_imei = #{bo.deviceImei}
and a.device_imei like concat('%',#{bo.deviceImei}, '%')
</if>
<if test="bo.content != null and bo.content != ''">
AND a.device_imei = #{bo.content} or a.device_mac = #{bo.content}
AND (a.device_imei like concat('%',#{bo.content}, '%') or a.device_mac like concat('%',#{bo.content}, '%') )
</if>
<if test="bo.startTime != null and bo.startTime != ''">
AND a.create_time <![CDATA[>=]]> #{bo.startTime}