From e9af2e9f07a78b1971d6a32ef0dcb7a52b59b66f Mon Sep 17 00:00:00 2001
From: wangfs <15029758498@163.com>
Date: Sat, 20 Dec 2025 16:30:54 +0800
Subject: [PATCH] 优化

---
 urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml | 40 ++++++++++++++++++----------------------
 urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml     | 71 +++++++++++++++++++++++++++++++++--------------------------------------
 2 files changed, 51 insertions(+), 60 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 561997d..d6ae343 100644
--- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
@@ -24,11 +24,12 @@
         a.finish_state,
         a.begin_time,
         a.end_time
-        FROM garden_inspection_plan a,
-        garden_inspection_plan_detail b,
-        (select distinct batch_no, dept_id
-        from garden_maintain_plan_role
-        where deleted = 0
+        FROM
+        garden_inspection_plan a
+        INNER JOIN (
+        SELECT DISTINCT batch_no
+        FROM garden_inspection_plan_role
+        WHERE deleted = 0
         AND dept_id = #{req.deptId}
         <if test="req.roleIds != null and req.roleIds.size() > 0">
             AND role_id IN
@@ -36,14 +37,11 @@
                 #{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
+        ) c ON a.batch_no = c.batch_no
+        WHERE
+        a.deleted = 0
         <if test="req.roadName != null and req.roadName !=''">
-            AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
+            AND a.road_name LIKE CONCAT('%', #{req.roadName}, '%')
         </if>
         <if test="req.busiLineList != null and req.busiLineList.size() > 0">
             AND a.busi_line IN
@@ -51,24 +49,22 @@
                 #{busiLine}
             </foreach>
         </if>
-        <!--状态 1:未完成;2:已完成;3:已失效 4:终止-->
-        and b.finish_state = a.finish_state
-        <!--状态 1:未完成;2:已完成;3:已失效-->
-        and a.finish_state = b.finish_state
+        <!-- 状态过滤 -->
         <if test="req.finishState == 1">
-            and a.finish_state = 1
-            <![CDATA[and a.begin_time <= #{req.localDate}
-                     and a.end_time >= #{req.localDate}]]>
+            AND a.finish_state = 1
+           <![CDATA[AND a.begin_time <= #{req.localDate}
+            AND a.end_time >= #{req.localDate}]]>
         </if>
         <if test="req.finishState == 2">
-            and a.finish_state = 2
+            AND a.finish_state = 2
         </if>
         <if test="req.finishState == 3">
-            and a.finish_state = 3
+            AND a.finish_state = 3
         </if>
         <if test="req.finishState == 4">
-            and a.finish_state = 4
+            AND a.finish_state = 4
         </if>
 
+
     </select>
 </mapper>
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 28915ff..6c220f0 100644
--- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
@@ -25,11 +25,11 @@
         a.begin_time,
         a.end_time
         FROM
-        garden_maintain_plan a,
-        garden_maintain_plan_detail b,
-       (select distinct batch_no, dept_id
-        from garden_maintain_plan_role
-        where deleted = 0
+        garden_maintain_plan a
+        INNER JOIN (
+        SELECT DISTINCT batch_no
+        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
@@ -37,38 +37,35 @@
                 #{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
-        <if test="req.roadName != null and req.roadName !=''">
-            AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
+        ) c ON a.batch_no = c.batch_no
+        WHERE
+        a.deleted = 0
+        <if test="req.roadName != null and req.roadName != ''">
+            AND a.road_name LIKE CONCAT('%', #{req.roadName}, '%')
         </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=")">
                 #{busiLine}
             </foreach>
         </if>
-        <!--状态 1:未完成;2:已完成;3:已失效-->
-        and a.finish_state = b.finish_state
-        <if test="req.finishState == 1">
-            and a.finish_state = 1
-            <![CDATA[and a.begin_time <= #{req.localDate}
-                     and a.end_time >= #{req.localDate}]]>
-        </if>
-        <if test="req.finishState == 2">
-            and a.finish_state = 2
-        </if>
-        <if test="req.finishState == 3">
-            and a.finish_state = 3
-        </if>
-        <if test="req.finishState == 4">
-            and a.finish_state = 4
-        </if>
+        <!-- 状态过滤 -->
+        <choose>
+            <when test="req.finishState == 1">
+                AND a.finish_state = 1
+                AND a.begin_time <![CDATA[ <= ]]> #{req.localDate}
+                AND a.end_time  <![CDATA[ >= ]]> #{req.localDate}
+            </when>
+            <when test="req.finishState == 2">
+                AND a.finish_state = 2
+            </when>
+            <when test="req.finishState == 3">
+                AND a.finish_state = 3
+            </when>
+            <when test="req.finishState == 4">
+                AND a.finish_state = 4
+            </when>
+        </choose>
     </select>
 
     <select id="appMaintainPlanPlanTypePage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO">
@@ -85,9 +82,9 @@
         c.begin_time,
         c.end_time
         FROM
-        garden_maintain_plan a,
-        garden_maintain_plan_detail c,
-        (select distinct batch_no, dept_id
+        garden_maintain_plan a
+        INNER JOIN  garden_maintain_plan_detail c ON a.batch_no = c.batch_no
+        INNER JOIN (select distinct batch_no, dept_id
         from garden_maintain_plan_role
         where deleted = 0
         AND dept_id = #{req.deptId}
@@ -97,15 +94,13 @@
                 #{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
+        )   d ON c.batch_no = d.batch_no and c.dept_id = d.dept_id
+
         AND a.deleted=c.deleted
         AND a.deleted=0
         AND a.plan_type_id = #{req.planTypeId}
         <if test="req.planName != null and req.planName !=''">
-            AND a.plan_type_id LIKE CONCAT('%',#{req.planName},'%')
+            AND a.plan_name LIKE CONCAT('%',#{req.planName},'%')
         </if>
         <if test="req.busiLineList != null and req.busiLineList.size() > 0">
             AND a.busi_line IN
--
libgit2 0.21.4