refactor(ems): 优化数据查询和展示

- 修改为记录时间查询框,调整日期选择器的显示和使用
- 统一排序方式,使用 objId 进行排序
boardTest
zch 2 months ago
parent b788c4f723
commit bc6b241dcb

@ -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>

@ -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">

Loading…
Cancel
Save