From dd1c75c79052c69c89ef2b045e12740f3ea5d4e3 Mon Sep 17 00:00:00 2001
From: wangfs <15029758498@163.com>
Date: Sat, 20 Dec 2025 19:01:44 +0800
Subject: [PATCH] 优化

---
 urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml | 2 ++
 urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml       | 2 ++
 urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml           | 4 ++++
 3 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml
index 779d0cb..d400a13 100644
--- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml
@@ -57,6 +57,8 @@
             </when>
             <when test="req.finishState == 4">
                 AND b.finish_state = 4
+                <![CDATA[AND b.begin_time  <=  #{req.localDateTime}
+                         AND b.end_time  >= #{req.localDateTime}]]>
             </when>
         </choose>
     </select>
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 8dc7f04..b039f61 100644
--- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
@@ -64,6 +64,8 @@
         </if>
         <if test="req.finishState == 4">
             AND b.finish_state = 4
+            <![CDATA[AND b.begin_time <= #{req.localDateTime}
+            AND b.end_time >= #{req.localDateTime}]]>
         </if>
          ORDER BY b.id desc
     </select>
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 25f1c7a..13e81ff 100644
--- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
@@ -66,6 +66,8 @@
             </when>
             <when test="req.finishState == 4">
                 AND b.finish_state = 4
+                <![CDATA[AND b.begin_time  <=  #{req.localDateTime}
+                AND b.end_time  >= #{req.localDateTime}]]>
             </when>
         </choose>
         ORDER BY b.id desc
@@ -124,6 +126,8 @@
         </if>
         <if test="req.finishState == 4">
             and a.finish_state = 4
+            <![CDATA[and c.begin_time <= #{req.localDateTime}
+                     and c.end_time >= #{req.localDateTime}]]>
         </if>
         ORDER BY a.id desc
     </select>
--
libgit2 0.21.4