From b00dd7882fa19c346d086363c67c76b01051e594 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 09 八月 2023 13:52:50 +0800
Subject: [PATCH] 数据库取消uuid自动生成主键，对应的实体业务增加主键uuid

---
 ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index 1e9ea58..7e82cdb 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -18,7 +18,7 @@
     <sql id="selectArdAppPatrolplanVo">
         select
             ard_app_patrolplan.id,
-            sys_user.nick_name,
+<!--            sys_user.nick_name,-->
             ard_app_patrolplan.patro_end_time,
             ard_app_patrolplan.user_id,
             ard_app_patrolplan.cycle,
@@ -34,20 +34,20 @@
         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 ard_app_patrolplan.user_id = sys_user.user_id
-        <where>  
-            <if test="userId != null  and userId != ''"> and ard_app_patrolplan.user_id = #{userId}</if>
+        <where>
+            ard_app_patrolplan.user_id = #{userId}
             <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 = (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})
             </if>
             <if test="pUser != null  and pUser != ''">
-                and users.app_user_id = (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})
             </if>
         </where>
-            group by ard_app_patrolplan.id,sys_user.nick_name
+            group by ard_app_patrolplan.id
     </select>
     
     <select id="selectArdAppPatrolplanByPatroEndTime" parameterType="String" resultMap="ArdAppPatrolplanResult">
@@ -103,4 +103,8 @@
             #{id}
         </foreach>
     </delete>
+
+    <delete id="deleteArdAppPatrolplanById" parameterType="String">
+        delete from ard_app_patrolplan aap where aap.id = #{id};
+    </delete>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3