From 520f75d0c72fdfbcff73650af0d6a0c2a9bc3366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AF=E9=BE=99=20=E6=9B=B9?= <1805857645@QQ.com>
Date: Thu, 29 Aug 2024 11:21:47 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=E4=BF=AE=E7=89=A9=E8=81=94=E7=BD=91?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=E6=A0=B9=E6=8D=AE=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=E6=97=B6=E9=97=B4=E5=92=8C=E8=AE=B0=E5=BD=95=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=95=B0=E6=8D=AE=E6=A0=B9=E6=8D=AE=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ems/record/TWTempertureDataMapper.xml         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/os-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml b/os-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml
index f02054f..97a9c0f 100644
--- a/os-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml
@@ -44,7 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTWTempertureDataVo"/>
         <where>  
             <if test="monitorId != null  and monitorId != ''"> and twtd.monitorId = #{monitorId}</if>
-            <if test="collectTime != null "> and twtd.collectTime = #{collectTime}</if>
+            <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
+                and twtd.collectTime between #{params.beginCollectTime} and #{params.endCollectTime}
+            </if>
             <if test="tempreture != null "> and twtd.tempreture = #{tempreture}</if>
             <if test="humidity != null "> and twtd.humidity = #{humidity}</if>
             <if test="illuminance != null "> and twtd.illuminance = #{illuminance}</if>
@@ -53,9 +55,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="recodeTime != null "> and twtd.recodeTime = #{recodeTime}</if>
             <if test="alarmType != null "> and twtd.alarmType = #{alarmType}</if>
             <if test="confirmPersonID != null "> and twtd.confirmPersonID = #{confirmPersonID}</if>
-            <if test="confirmTime != null "> and twtd.confirmTime = #{confirmTime}</if>
+            <if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != ''">
+                and twtd.recodeTime between #{params.beginRecordTime} and #{params.endRecordTime}
+            </if>
             <if test="confirmFlag != null "> and twtd.confirmFlag = #{confirmFlag}</if>
         </where>
+        order by twtd.collectTime desc
     </select>
     
     <select id="selectTWTempertureDataByObjid" parameterType="Long" resultMap="TWTempertureDataResult">