|
|
@@ -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"));
|
|
|
+ }
|
|
|
|
|
|
|
|
|
}
|