From c8aaafaaf4b6ff674149db115a97e40ead5927bf Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 08 七月 2024 16:57:00 +0800
Subject: [PATCH] 车辆挂接电磁锁bug修改提交

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

diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index 6298d2d..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"    />
@@ -40,6 +40,8 @@
             <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="createTimeBegin != null  and createTimeBegin != ''"> and ard_app_patrolplan.create_time &gt;= #{createTimeBegin} </if>
+            <if test="createTimeEnd != null  and createTimeEnd != ''"> and ard_app_patrolplan.create_time &lt;= #{createTimeEnd}</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 = #{wellId}
@@ -51,12 +53,12 @@
         </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=",">
@@ -156,4 +158,13 @@
                                LEFT JOIN ard_app_patroluser users on users.patrolplan_id = plan."id"
         where users.app_user_id = #{userId} and cycle = 'day' and create_time &lt; #{end} and del_name is null and del_time is null ;
     </select>
-</mapper>
\ No newline at end of file
+
+    <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 &gt;= #{beforeTime} and  plan.create_time &lt;= #{time}
+          and del_name is null and del_time is null order by plan.create_time desc;
+    </select>
+</mapper>

--
Gitblit v1.9.3