From bf75d92d753bcd3cf871d6d1201f8dd359b11bc6 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 24 十一月 2023 14:50:29 +0800
Subject: [PATCH] 优化application删除不必要的配置 优化pom中多余的依赖
---
ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml | 70 ++++++++++++++++++++++++++++++++---
1 files changed, 64 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 4646180..19f4175 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,22 @@
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} 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>
<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})
+<!-- 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 = (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,sys_user.nick_name
+ group by ard_app_patrolplan.id
</select>
<select id="selectArdAppPatrolplanByPatroEndTime" parameterType="String" resultMap="ArdAppPatrolplanResult">
@@ -107,4 +109,60 @@
<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>
+
+ <select id="executeList" 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>
+ users.app_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>
+ <if test="patroEndTime != null and patroEndTime != ''"> and patro_end_time <= #{patroEndTime}</if>
+ <if test="wellId != null and wellId != ''">
+ and well.alarmpoints_id = #{wellId}
+ </if>
+ <if test="pUser != null and pUser != ''">
+ and users.app_user_id = #{pUser}
+ </if>
+ </where>
+ group by ard_app_patrolplan.id
+ </select>
+
+ <select id="oncePlan" parameterType="recordMonthExParam" resultMap="ArdAppPatrolplanResult">
+ select plan.* from ard_app_patrolplan plan
+ LEFT JOIN ard_app_patroluser users on users.patrolplan_id = plan."id"
+ where users.app_user_id = #{userId} and cycle = 'once' and patro_begin_time >= #{begin} and plan.del_name is null and plan.del_time is null ;
+ </select>
+
+ <select id="dayPlan" parameterType="recordMonthExParam" resultMap="ArdAppPatrolplanResult">
+ select plan.* from ard_app_patrolplan plan
+ LEFT JOIN ard_app_patroluser users on users.patrolplan_id = plan."id"
+ where users.app_user_id = #{userId} and cycle = 'day' and create_time < #{end} and del_name is null and del_time is null ;
+ </select>
+
+ <select id="planUser" parameterType="String" resultMap="ArdAppPatrolplanResult">
+ select s.nick_name, plan.plan_name from ard_app_patrolplan plan
+ LEFT JOIN ard_app_patroluser users on users.patrolplan_id = plan."id"
+ left join sys_user s on plan.user_id = s.user_id
+ where users.app_user_id = #{userId} and son is null
+ and plan.create_time >= #{beforeTime} and plan.create_time <= #{time}
+ and del_name is null and del_time is null order by plan.create_time desc;
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3