From d85713cca5443547a7d4646d4e80abfce136eff8 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 02 七月 2024 15:54:17 +0800
Subject: [PATCH] 电磁锁根据三一车辆主键删除提交
---
ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml | 92 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 81 insertions(+), 11 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index 32259ab..6c689b2 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.app.patrolplan.mapper.ArdAppPatrolplanMapper">
-
+
<resultMap type="ArdAppPatrolplan" id="ArdAppPatrolplanResult">
<result property="patroEndTime" column="patro_end_time" />
<result property="userId" column="user_id" />
@@ -12,11 +12,13 @@
<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
ard_app_patrolplan.id,
+<!-- sys_user.nick_name,-->
ard_app_patrolplan.patro_end_time,
ard_app_patrolplan.user_id,
ard_app_patrolplan.cycle,
@@ -31,27 +33,32 @@
<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
- <where>
- <if test="userId != null and userId != ''"> and user_id = #{userId}</if>
+ left join sys_user on ard_app_patrolplan.user_id = sys_user.user_id
+ <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="createTimeBegin != null and createTimeBegin != ''"> and ard_app_patrolplan.create_time >= #{createTimeBegin} </if>
+ <if test="createTimeEnd != null and createTimeEnd != ''"> and ard_app_patrolplan.create_time <= #{createTimeEnd}</if>
<if test="wellId != null and wellId != ''">
- and well.alarmpoints_id = (select 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 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
</select>
-
+
<select id="selectArdAppPatrolplanByPatroEndTime" parameterType="String" resultMap="ArdAppPatrolplanResult">
<include refid="selectArdAppPatrolplanVo"/>
where patro_end_time = #{patroEndTime}
</select>
-
+
<insert id="insertArdAppPatrolplan" parameterType="ArdAppPatrolplan">
insert into ard_app_patrolplan
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -88,13 +95,76 @@
</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
+
+ <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>
--
Gitblit v1.9.3