联调问题

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;
 

bonus-business/src/main/java/com/bonus/digital/dao/MonthlyPlanVo.java

@@ -203,4 +203,9 @@ public class MonthlyPlanVo {
      */
     private  String keyWord;
 
+    /**
+     * 当天时间
+     */
+    private  String nowDate;
+
 }

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