Просмотр исходного кода

新增/编辑账号的时候 根据设置的任务开始日期 生成任务排期

lqc 5 лет назад
Родитель
Сommit
f8ed3f7c18

+ 2 - 1
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxTaskScheduleController.java

@@ -140,7 +140,8 @@ public class FosterwxTaskScheduleController extends BaseController<FosterwxTaskS
                 FosterwxTaskScheduleHandle fosterwxTaskScheduleHandle = new FosterwxTaskScheduleHandle();
                 fosterwxTaskScheduleHandle.setTaskId(fosterwxTaskSchedule.getTaskId());
                 fosterwxTaskScheduleHandle.setStationId(fosterwxTaskSchedule.getStationId());
-                FosterwxTaskSchedule mobileContent = fosterwxTaskScheduleService.getInfo(handle);
+                fosterwxTaskScheduleHandle.setSendDate(fosterwxTaskSchedule.getSendDate());
+                FosterwxTaskSchedule mobileContent = fosterwxTaskScheduleService.getInfo(fosterwxTaskScheduleHandle);
                 if (null != mobileContent) {
                     fosterwxTaskSchedule.setMobileCount(mobileContent.getMobileCount());
                     fosterwxTaskSchedule.setComment(mobileContent.getComment());

+ 2 - 1
src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxTaskScheduleServiceImpl.java

@@ -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);