From d06a1424f108c9b321a268b53918bba0a569e7bc Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 13 九月 2023 13:02:55 +0800
Subject: [PATCH] 修改外联历史报警按alarm_time逆序返回数据 修改门禁历史报警按alarm_time逆序返回数据 修改app一键历史报警按create_time逆序返回数据
---
ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
index 8c390a1..b34868d 100644
--- a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
@@ -31,6 +31,12 @@
<result property="cameraId" column="camera_id"/>
</resultMap>
+ <resultMap type="ArdAlarmpointsWell" id="wellResult">
+ <result property="id" column="id"/>
+ <result property="wellId" column="well_id"/>
+ <result property="type" column="type"/>
+ </resultMap>
+
<sql id="selectArdAlarmpointsWellVo">
select c.id,
c.well_id,
@@ -64,7 +70,7 @@
<select id="selectArdAlarmpointsWellList" parameterType="ArdAlarmpointsWell" resultMap="ArdAlarmpointsWellResult">
<include refid="selectArdAlarmpointsWellVo"/>
<where>
- <if test="wellId != null and wellId != ''">and c.well_id = #{wellId}</if>
+ <if test="wellId != null and wellId != ''">and c.well_id like ('%${wellId}%')</if>
<if test="wellNumber != null and wellNumber != ''">and c.well_number = #{wellNumber}</if>
<if test="userId != null and userId != ''">and c.user_id = #{userId}</if>
<if test="deptId != null ">and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t
@@ -192,9 +198,12 @@
#{id}
</foreach>
</delete>
- <select id="checkWellIdExists" resultType="boolean">
- SELECT COUNT(*)
- FROM ard_alarmpoints_well
- WHERE well_id = #{wellId}
+ <select id="checkWellIdExists" resultType="ArdAlarmpointsWell">
+ SELECT * FROM ard_alarmpoints_well WHERE well_id = #{wellId} limit 1
+ </select>
+
+ <select id="wellByPlanId" parameterType="String" resultMap="wellResult">
+ select ard_app_patrolpoint.alarmpoints_id as id,ard_alarmpoints_well.well_id, ard_app_patrolpoint."type",ard_alarmpoints_well.longitude,ard_alarmpoints_well.latitude from ard_alarmpoints_well LEFT JOIN ard_app_patrolpoint on ard_app_patrolpoint.alarmpoints_id = ard_alarmpoints_well.id where ard_alarmpoints_well.id in (select alarmpoints_id from ard_app_patrolpoint where patrolplan_id = #{id})
+ GROUP BY ard_app_patrolpoint.alarmpoints_id,ard_alarmpoints_well.well_id,ard_app_patrolpoint."type",ard_alarmpoints_well.longitude,ard_alarmpoints_well.latitude
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3