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}, '%')) + + AND (tmp.project_name like concat('%', #{keyWord}, '%') + or tmp.work_content like concat('%', #{keyWord}, '%')) + + + and #{nowDate} between tmp.planned_start_time and tmp.planned_end_time +