From aa7ce37ca655742ab49e7690774cd40fa06684fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Fri, 26 Dec 2025 15:07:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/bonus/digital/dao/DayPlanVo.java     | 2 +-
 .../src/main/java/com/bonus/digital/dao/MonthlyPlanVo.java | 5 +++++
 .../src/main/resources/mapper/MonthPlanMapper.xml          | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/bonus-business/src/main/java/com/bonus/digital/dao/DayPlanVo.java b/bonus-business/src/main/java/com/bonus/digital/dao/DayPlanVo.java
index ab401d0..f196038 100644
--- a/bonus-business/src/main/java/com/bonus/digital/dao/DayPlanVo.java
+++ b/bonus-business/src/main/java/com/bonus/digital/dao/DayPlanVo.java
@@ -162,7 +162,7 @@ public class DayPlanVo {
     private String status;
 
     /**
-     * 日计划类型
+     * 日计划类型 0：运行  1：检修  2：项目部
      */
     private String dayPlanType;
 
diff --git a/bonus-business/src/main/java/com/bonus/digital/dao/MonthlyPlanVo.java b/bonus-business/src/main/java/com/bonus/digital/dao/MonthlyPlanVo.java
index a20db42..65320e4 100644
--- a/bonus-business/src/main/java/com/bonus/digital/dao/MonthlyPlanVo.java
+++ b/bonus-business/src/main/java/com/bonus/digital/dao/MonthlyPlanVo.java
@@ -203,4 +203,9 @@ public class MonthlyPlanVo {
      */
     private  String keyWord;
 
+    /**
+     * 当天时间
+     */
+    private  String nowDate;
+
 }
diff --git a/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml b/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml
index 731beb4..66bbeeb 100644
--- a/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml
+++ b/bonus-business/src/main/resources/mapper/MonthPlanMapper.xml
@@ -154,6 +154,13 @@
             AND (tmp.project_name like concat('%', #{keyWord}, '%')
             or tmp.work_content like concat('%', #{keyWord}, '%'))
         </if>
+        <if test="keyWord!= null " >
+            AND (tmp.project_name like concat('%', #{keyWord}, '%')
+            or tmp.work_content like concat('%', #{keyWord}, '%'))
+        </if>
+        <if test="nowDate!= null " >
+            and #{nowDate} between tmp.planned_start_time and tmp.planned_end_time
+        </if>
     </select>
     <select id="getPersonnelArrangementList" resultType="com.bonus.digital.dao.PersonnelArrangementVo">
         select personnel_arrangement_id,monthly_plan_id,day,personnel_names