From 2aa0ffa6eea188f44eabc50617ddf97c804fc89f Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 21 九月 2023 16:32:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index 568b736..19f4175 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -144,4 +144,25 @@
         </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 &gt;= #{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 &lt; #{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 &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>
\ No newline at end of file

--
Gitblit v1.9.3