|
|
@@ -1,5 +1,6 @@
|
|
|
package org.dromara.system.service.impl;
|
|
|
|
|
|
+import org.dromara.common.core.utils.DateUtils;
|
|
|
import org.dromara.common.core.utils.MapstructUtils;
|
|
|
import org.dromara.common.core.utils.StringUtils;
|
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
|
@@ -15,6 +16,7 @@ import org.dromara.system.domain.TblCarSchedule;
|
|
|
import org.dromara.system.mapper.TblCarScheduleMapper;
|
|
|
import org.dromara.system.service.ITblCarScheduleService;
|
|
|
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Collection;
|
|
|
@@ -65,7 +67,15 @@ 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){
|
|
|
- lqw.gt(bo.getParams().get("scheduleDate")!=null, TblCarSchedule::getScheduleDate, bo.getParams().get("scheduleDate"));
|
|
|
+ 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){}
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
lqw.orderBy(true,true,TblCarSchedule::getScheduleDate);
|
|
|
return lqw;
|