From 579de493824736473614cadd64d0905696ddfd87 Mon Sep 17 00:00:00 2001
From: wangfs <15029758498@163.com>
Date: Sat, 20 Dec 2025 15:23:27 +0800
Subject: [PATCH] 优化

---
 urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml | 19 +++++++++++--------
 urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml     | 39 +++++++++++++++++++++++----------------
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
index 1968c92..2e6b790 100644
--- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
@@ -26,22 +26,25 @@
         a.end_time
         FROM garden_inspection_plan a,
         garden_inspection_plan_detail b,
-        garden_maintain_plan_role c
+        (select distinct batch_no, dept_id
+        from garden_maintain_plan_role
+        where deleted = 0
+        AND dept_id = #{req.deptId}
+        <if test="req.roleIds != null and req.roleIds.size() > 0">
+            AND role_id IN
+            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
+                #{roleId}
+            </foreach>
+        </if>
+        )   c
         WHERE a.batch_no = b.batch_no
         AND a.batch_no = c.batch_no
         AND a.dept_id = c.dept_id
         AND a.deleted = b.deleted
         AND a.deleted = 0
-        AND a.dept_id = #{req.deptId}
         <if test="req.roadName != null and req.roadName !=''">
             AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
         </if>
-        <if test="req.roleIds != null and req.roleIds.size() > 0">
-            AND c.role_id IN
-            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
-                #{roleId}
-            </foreach>
-        </if>
         <if test="req.busiLineList != null and req.busiLineList.size() > 0">
             AND a.busi_line IN
             <foreach collection="req.busiLineList" item="busiLine" open="(" separator="," close=")">
diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
index cbc38e4..7c7a611 100644
--- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
@@ -27,22 +27,26 @@
         FROM
         garden_maintain_plan a,
         garden_maintain_plan_detail b,
-        garden_maintain_plan_role c
+       (select distinct batch_no, dept_id
+        from garden_maintain_plan_role
+        where deleted = 0
+        AND dept_id = #{req.deptId}
+        <if test="req.roleIds != null and req.roleIds.size() > 0">
+            AND role_id IN
+            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
+                #{roleId}
+            </foreach>
+        </if>
+        )  c
         WHERE a.batch_no = b.batch_no
         AND a.batch_no = c.batch_no
         AND a.dept_id = c.dept_id
         AND a.deleted = b.deleted
         AND a.deleted = 0
-        AND a.dept_id = #{req.deptId}
         <if test="req.roadName != null and req.roadName !=''">
             AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
         </if>
-        <if test="req.roleIds != null and req.roleIds.size() > 0">
-            AND c.role_id IN
-            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
-                #{roleId}
-            </foreach>
-        </if>
+
         <if test="req.busiLineList != null and req.busiLineList.size() > 0">
             AND a.busi_line IN
             <foreach collection="req.busiLineList" item="busiLine" open="(" separator="," close=")">
@@ -70,23 +74,26 @@
         FROM
         garden_maintain_plan a,
         garden_maintain_plan_detail c,
-        garden_maintain_plan_role d
+        (select distinct batch_no, dept_id
+        from garden_maintain_plan_role
+        where deleted = 0
+        AND dept_id = #{req.deptId}
+        <if test="req.roleIds != null and req.roleIds.size() > 0">
+            AND role_id IN
+            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
+                #{roleId}
+            </foreach>
+        </if>
+        )   d
         WHERE a.batch_no = c.batch_no
         AND a.batch_no = d.batch_no
         AND a.dept_id = d.dept_id
         AND a.deleted=c.deleted
         AND a.deleted=0
-        AND a.dept_id = #{req.deptId}
         AND a.plan_type_id = #{req.planTypeId}
         <if test="req.planName != null and req.planName !=''">
             AND a.plan_type_id LIKE CONCAT('%',#{req.planName},'%')
         </if>
-        <if test="req.roleIds != null and req.roleIds.size() > 0">
-            AND d.role_id IN
-            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
-                #{roleId}
-            </foreach>
-        </if>
         <if test="req.busiLineList != null and req.busiLineList.size() > 0">
             AND a.busi_line IN
             <foreach collection="req.busiLineList" item="busiLine" open="(" separator="," close=")">
--
libgit2 0.21.4