From a5805f7061fd8a4d78c0d593c1b0ffdf2241d8a0 Mon Sep 17 00:00:00 2001
From: wangfs <15029758498@163.com>
Date: Sat, 20 Dec 2025 19:37:19 +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/MaintainPlanDetailMapper.xml     | 4 ++++
 urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml           | 5 +++++
 4 files changed, 13 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 d400a13..9bc180d 100644
--- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml
@@ -54,6 +54,8 @@
             </when>
             <when test="req.finishState == 3">
                 AND b.finish_state = 3
+                <![CDATA[AND b.begin_time  <=  #{req.localDateTime}
+                         AND b.end_time  >= #{req.localDateTime}]]>
             </when>
             <when test="req.finishState == 4">
                 AND b.finish_state = 4
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 b039f61..735f806 100644
--- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
@@ -61,6 +61,8 @@
         </if>
         <if test="req.finishState == 3">
             AND b.finish_state = 3
+            <![CDATA[AND b.begin_time <= #{req.localDateTime}
+            AND b.end_time >= #{req.localDateTime}]]>
         </if>
         <if test="req.finishState == 4">
             AND b.finish_state = 4
diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml
index 3d514ff..5be6195 100644
--- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml
@@ -56,9 +56,13 @@
             </when>
             <when test="req.finishState == 3">
                 AND c.finish_state = 3
+                <![CDATA[AND c.begin_time  <=  #{req.localDateTime}
+                         AND c.end_time  >= #{req.localDateTime}]]>
             </when>
             <when test="req.finishState == 4">
                 AND c.finish_state = 4
+                <![CDATA[AND c.begin_time  <=  #{req.localDateTime}
+                         AND c.end_time  >= #{req.localDateTime}]]>
             </when>
         </choose>
     </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 13e81ff..82d86c8 100644
--- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
@@ -60,9 +60,12 @@
             </when>
             <when test="req.finishState == 2">
                 AND b.finish_state = 2
+
             </when>
             <when test="req.finishState == 3">
                 AND b.finish_state = 3
+                <![CDATA[AND b.begin_time  <=  #{req.localDateTime}
+                AND b.end_time  >= #{req.localDateTime}]]>
             </when>
             <when test="req.finishState == 4">
                 AND b.finish_state = 4
@@ -123,6 +126,8 @@
         </if>
         <if test="req.finishState == 3">
             and a.finish_state = 3
+            <![CDATA[and c.begin_time <= #{req.localDateTime}
+                     and c.end_time >= #{req.localDateTime}]]>
         </if>
         <if test="req.finishState == 4">
             and a.finish_state = 4
--
libgit2 0.21.4