From bc6b241dcb51d31143c6625c8b5cae9d28d5421d Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Wed, 30 Apr 2025 16:18:31 +0800
Subject: [PATCH] =?UTF-8?q?refactor(ems):=20=E4=BC=98=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改为记录时间查询框，调整日期选择器的显示和使用
- 统一排序方式，使用 objId 进行排序
---
 .../mapper/ems/record/EmsVibrationInstantMapper.xml         | 2 +-
 .../resources/mapper/ems/record/TWTempertureDataMapper.xml  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml b/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml
index ba14c93..095969e 100644
--- a/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
                 and rdi.collectTime between #{params.beginCollectTime} and #{params.endCollectTime}</if>
             <if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != ''">
-                and rdi.collectTime between #{params.beginRecordTime} and #{params.endRecordTime}</if>
+                and rdi.recordTime between #{params.beginRecordTime} and #{params.endRecordTime}</if>
         </where>
         order by rdi.objId
     </select>
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 b76dc95..bcdf735 100644
--- a/os-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="confirmFlag != null "> and twtd.confirmFlag = #{confirmFlag}</if>
         </where>
-        order by twtd.recodeTime desc
+        order by twtd.objId desc
     </select>
     
     <select id="selectTWTempertureDataByObjid" parameterType="Long" resultMap="TWTempertureDataResult">
@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != ''">
                 and recodeTime between #{params.beginRecordTime} and #{params.endRecordTime}</if>
         </where>
-        order by twtd.collectTime
+        order by twtd.objId
     </select>
 
     <select id="selectIotInstantMinitoringData" parameterType="TWTempertureData" resultMap="TWTempertureDataResult">
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="monitorId != null  and monitorId != ''"> and twtd.monitorId = #{monitorId}</if>
         </where>
-        order by twtd.recordTime desc
+        order by twtd.objId desc
     </select>
 
     <insert id="insertTWTempertureData" parameterType="TWTempertureData" useGeneratedKeys="true" keyProperty="objid">