From b991e27cc97c09c6a7044fefc99591b7c930124b Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期一, 14 八月 2023 11:44:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index 7e82cdb..2e0a218 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -35,16 +35,18 @@
         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 &gt;= #{patroBeginTime}</if>
             <if test="patroEndTime != null  and patroEndTime != ''"> and patro_end_time &lt;= #{patroEndTime}</if>
             <if test="wellId != null  and wellId != ''">
-                and well.alarmpoints_id in (select ard_alarmpoints_well.id from ard_alarmpoints_well where well_id = #{wellId})
+<!--                and well.alarmpoints_id in (select ard_alarmpoints_well.id from ard_alarmpoints_well where well_id = #{wellId})-->
+                and well.alarmpoints_id = #{wellId}
             </if>
             <if test="pUser != null  and pUser != ''">
-                and users.app_user_id in (select sys_user.user_id from sys_user where nick_name = #{pUser})
+<!--                and users.app_user_id in (select sys_user.user_id from sys_user where nick_name = #{pUser})-->
+                and users.app_user_id = #{pUser}
             </if>
         </where>
             group by ard_app_patrolplan.id
@@ -107,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