|
|
@@ -18,10 +18,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;
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* 车及人员排班Service业务层处理
|
|
|
@@ -48,6 +45,15 @@ public class TblCarScheduleServiceImpl implements ITblCarScheduleService {
|
|
|
*/
|
|
|
@Override
|
|
|
public TableDataInfo<TblCarScheduleVo> queryPageList(TblCarScheduleBo bo, PageQuery pageQuery) {
|
|
|
+ if(bo.getParams()!=null && bo.getParams().get("getallday")!=null){
|
|
|
+ List<String> data = baseMapper.getScheduleDay();
|
|
|
+ List<TblCarScheduleVo> dr = data.stream().map(e -> {
|
|
|
+ TblCarScheduleVo tblCarSchedule = new TblCarScheduleVo();
|
|
|
+ tblCarSchedule.setScheduleDate(DateUtils.parseDate(e));
|
|
|
+ return tblCarSchedule;
|
|
|
+ }).toList();
|
|
|
+ return TableDataInfo.build(dr);
|
|
|
+ }
|
|
|
LambdaQueryWrapper<TblCarSchedule> lqw = buildQueryWrapper(bo);
|
|
|
Page<TblCarScheduleVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
|
|
|
|
|
@@ -58,9 +64,13 @@ public class TblCarScheduleServiceImpl implements ITblCarScheduleService {
|
|
|
e.setStationInfo(StringUtils.format("{\"currentStation\":\"{}\",\"passStations\":\"{}\"}",stations,stationName));
|
|
|
});
|
|
|
|
|
|
+
|
|
|
return TableDataInfo.build(result);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 查询车及人员排班列表
|
|
|
*/
|