wenhongquan 2 년 전
부모
커밋
7b57f98355
1개의 변경된 파일과 12개의 추가작업 그리고 6개의 파일을 삭제
  1. 12 6
      ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/TblCarScheduleServiceImpl.java

+ 12 - 6
ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/TblCarScheduleServiceImpl.java

@@ -67,13 +67,19 @@ public class TblCarScheduleServiceImpl implements ITblCarScheduleService {
         lqw.eq(StringUtils.isNotBlank(bo.getCarNum()), TblCarSchedule::getCarNum, bo.getCarNum());
         lqw.eq(bo.getScheduleDate() != null, TblCarSchedule::getScheduleDate, bo.getScheduleDate());
         if(bo.getParams()!=null && bo.getParams().keySet().size()>0){
-            try{
-               String start= bo.getParams().get("scheduleDate").toString()+" 00:00:00";
-                String end= bo.getParams().get("scheduleDate").toString()+" 23:59:59";
-                lqw.gt(bo.getParams().get("scheduleDate")!=null, TblCarSchedule::getScheduleDate, start);
-                lqw.lt(bo.getParams().get("scheduleDate")!=null, TblCarSchedule::getScheduleDate, end);
+            if(bo.getParams().get("scheduleDate")!=null){
+                try{
+                    String start= bo.getParams().get("scheduleDate").toString()+" 00:00:00";
+                    String end= bo.getParams().get("scheduleDate").toString()+" 23:59:59";
+                    lqw.gt(bo.getParams().get("scheduleDate")!=null, TblCarSchedule::getScheduleDate, start);
+                    lqw.lt(bo.getParams().get("scheduleDate")!=null, TblCarSchedule::getScheduleDate, end);
 
-            }catch (Exception e){}
+                }catch (Exception e){}
+            }
+            if(bo.getParams().get("starttime")!=null && bo.getParams().get("endtime")!=null){
+                lqw.gt(bo.getParams().get("starttime")!=null, TblCarSchedule::getScheduleDate, bo.getParams().get("starttime"));
+                lqw.lt(bo.getParams().get("endtime")!=null, TblCarSchedule::getScheduleDate, bo.getParams().get("endtime"));
+            }
 
 
         }