|
|
@@ -55,7 +55,7 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
|
|
|
Integer page = handle.getPage();
|
|
|
Page<FosterwxTaskSchedule> pageObj = new Page<FosterwxTaskSchedule>(page, pagesize);
|
|
|
QueryWrapper<FosterwxTaskSchedule> fosterwxTaskScheduleQueryWrapper = new QueryWrapper<>();
|
|
|
- fosterwxTaskScheduleQueryWrapper.select("distinct station_id,station_name,task_id,task_name,task_status,task_send_status,create_uid,send_time,err_msg,mark");
|
|
|
+ fosterwxTaskScheduleQueryWrapper.select("distinct station_id,station_name,task_id,task_name,task_status,task_send_status,create_uid,send_date,send_time,err_msg,mark");
|
|
|
fosterwxTaskScheduleQueryWrapper.eq("send_date", LocalDate.parse(handle.getDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|
|
|
if (null != handle.getId()) fosterwxTaskScheduleQueryWrapper.eq("id", handle.getId());
|
|
|
if (null != handle.getTaskName() && !handle.getTaskName().isEmpty())
|
|
|
@@ -185,6 +185,7 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
|
|
|
LambdaQueryWrapper<FosterwxTaskSchedule> fosterwxTaskScheduleLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getStationId, handle.getStationId());
|
|
|
fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getTaskId, handle.getTaskId());
|
|
|
+ fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getSendDate, handle.getSendDate());
|
|
|
fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getDelFlg, 1);
|
|
|
fosterwxTaskScheduleLambdaQueryWrapper.orderByAsc(FosterwxTaskSchedule::getMobileCode);
|
|
|
|