From 3249419e192b8ca3c31e5d14a2daac3a4a2352c6 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 14 八月 2023 09:59:25 +0800
Subject: [PATCH] app任务下发增加任务类型0-普通任务 1-报警任务
---
ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index cfeb44f..2e0a218 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -35,7 +35,7 @@
left join ard_app_patroluser as users on ard_app_patrolplan.id = users.patrolplan_id
left join sys_user on ard_app_patrolplan.user_id = sys_user.user_id
<where>
- ard_app_patrolplan.user_id = #{userId}
+ ard_app_patrolplan.user_id = #{userId} and del_name is null and del_time is null
<if test="cycle != null and cycle != ''"> and cycle = #{cycle}</if>
<if test="planName != null and planName != ''"> and plan_name like '%'||#{planName}||'%'</if>
<if test="patroBeginTime != null and patroBeginTime != ''"> and patro_begin_time >= #{patroBeginTime}</if>
@@ -109,4 +109,18 @@
<delete id="deleteArdAppPatrolplanById" parameterType="String">
delete from ard_app_patrolplan aap where aap.id = #{id};
</delete>
+
+ <select id="shouldRecord" parameterType="String" resultMap="ArdAppPatrolplanResult">
+ select
+ ard_app_patrolplan.id,
+ well.alarmpoints_id wellId,
+ users.app_user_id pUser,
+ sys_user.nick_name
+ from
+ ard_app_patrolplan
+ left join ard_app_patrolpoint as well on ard_app_patrolplan.id = well.patrolplan_id
+ left join ard_app_patroluser as users on ard_app_patrolplan.id = users.patrolplan_id
+ left join sys_user on users.app_user_id = sys_user.user_id
+ where ard_app_patrolplan.id = #{id} and del_name is null and del_time is null
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3