From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-api/src/main/resources/mapper/HandDeviceMapper.xml | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HandDeviceMapper.xml b/screen-api/src/main/resources/mapper/HandDeviceMapper.xml
index 18d162a..a7abf36 100644
--- a/screen-api/src/main/resources/mapper/HandDeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/HandDeviceMapper.xml
@@ -15,10 +15,12 @@
<result column="end_time" property="endTime" />
<result column="create_name" property="createName" />
<result column="update_name" property="updateName" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
- id,name,mac,address,longitude,latitude,start_time,is_delete,end_time
+ id,name,mac,address,longitude,latitude,start_time,is_delete,end_time,create_name,update_name,create_time,update_time
</sql>
<select id="Page" resultType="com.moral.api.entity.HandDevice">
select
@@ -32,14 +34,15 @@
<if test="mac != null and mac != ''">
and mac = #{mac}
</if>
- <if test="startTime != null and startTime != '' ">
- and date(start_time) <![CDATA[>=]]> #{startTime}
+ <if test="startTime != null and endTime == '' ">
+ and date(start_time) like CONCAT('%',#{startTime},'%')
</if>
- <if test="endTime != null and endTime !='' ">
+ <if test="endTime != '' and startTime != ''">
+ and date(start_time) <![CDATA[>=]]> #{startTime}
and date(end_time) <![CDATA[<=]]> #{endTime}
</if>
</where>
-
+ order by start_time desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0