jingquan #10

Merged
dyf merged 27 commits from liwenlong/fys-Multi-tenant:jingquan into main 2025-09-11 14:40:24 +08:00
24 changed files with 63 additions and 697 deletions
Showing only changes of commit 98ef841f18 - Show all commits

View File

@ -83,6 +83,7 @@ public class DeviceQueryCriteria extends BaseEntity {
/** /**
* 通讯方式 0:4G;1:蓝牙 * 通讯方式 0:4G;1:蓝牙
* communication_mode
*/ */
private Integer communicationMode; private Integer communicationMode;

View File

@ -74,6 +74,9 @@
<if test="criteria.groupId != null"> <if test="criteria.groupId != null">
and d.group_id = #{criteria.groupId} and d.group_id = #{criteria.groupId}
</if> </if>
<if test="criteria.communicationMode != null">
and t.communication_mode = #{criteria.communicationMode}
</if>
<if test="criteria.params.beginTime != null and criteria.params.endTime != null"> <if test="criteria.params.beginTime != null and criteria.params.endTime != null">
and da.create_time between #{criteria.params.beginTime} and #{criteria.params.endTime} and da.create_time between #{criteria.params.beginTime} and #{criteria.params.endTime}
</if> </if>