From 4753a47b1b5d538940a5509b504f1eaecc5a9f66 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 04 八月 2023 10:00:34 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index 59c3331..1e9ea58 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -12,21 +12,42 @@
<result property="id" column="id" />
<result property="planName" column="plan_name" />
<result property="patroBeginTime" column="patro_begin_time" />
+ <result property="nickName" column="nick_name" />
</resultMap>
<sql id="selectArdAppPatrolplanVo">
- select patro_end_time, user_id, cycle, create_time, id, plan_name, patro_begin_time from ard_app_patrolplan
+ select
+ ard_app_patrolplan.id,
+ sys_user.nick_name,
+ ard_app_patrolplan.patro_end_time,
+ ard_app_patrolplan.user_id,
+ ard_app_patrolplan.cycle,
+ ard_app_patrolplan.create_time,
+ ard_app_patrolplan.plan_name,
+ ard_app_patrolplan.patro_begin_time
+ from
+ ard_app_patrolplan
</sql>
<select id="selectArdAppPatrolplanList" parameterType="ArdAppPatrolplan" resultMap="ArdAppPatrolplanResult">
<include refid="selectArdAppPatrolplanVo"/>
+ 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 user_id = #{userId}</if>
+ <if test="userId != null and userId != ''"> and ard_app_patrolplan.user_id = #{userId}</if>
<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>
<if test="patroEndTime != null and patroEndTime != ''"> and patro_end_time <= #{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})
+ </if>
+ <if test="pUser != null and pUser != ''">
+ and users.app_user_id = (select sys_user.user_id from sys_user where nick_name = #{pUser})
+ </if>
</where>
+ group by ard_app_patrolplan.id,sys_user.nick_name
</select>
<select id="selectArdAppPatrolplanByPatroEndTime" parameterType="String" resultMap="ArdAppPatrolplanResult">
@@ -70,13 +91,16 @@
</update>
<delete id="deleteArdAppPatrolplanByPatroEndTime" parameterType="String">
- delete from ard_app_patrolplan where patro_end_time = #{patroEndTime}
+ delete from ard_app_patrolplan where ard_app_patrolplan.id = #{id};
</delete>
<delete id="deleteArdAppPatrolplanByPatroEndTimes" parameterType="String">
- delete from ard_app_patrolplan where patro_end_time in
+ delete 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
+ where ard_app_patrolplan.id in
<foreach item="patroEndTime" collection="array" open="(" separator="," close=")">
- #{patroEndTime}
+ #{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3