Merge branch 'dev-lqc' into test

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxMobileController.java

@@ -294,7 +294,10 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
                     } else if (null != fosterwxMobileTaskTimeList.getTaskEndAt() && gwOldTimeList.get(gwOldTimeList.size() - 1).getTaskEndAt() == null) {
                         fosterwxMobileTaskTimeListService.update(new FosterwxMobileTaskTimeList() {{
                             setTaskEndAt(fosterwxMobileTaskTimeList.getTaskEndAt());
-                        }}, new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, fosterwxMobile.getMobileUnioCode()).eq(FosterwxMobileTaskTimeList::getType, 1));
+                        }}, new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().
+                                eq(FosterwxMobileTaskTimeList::getMobileUnioCode, fosterwxMobile.getMobileUnioCode()).
+                                eq(FosterwxMobileTaskTimeList::getType, 1).
+                                eq(FosterwxMobileTaskTimeList::getId, gwOldTimeList.get(gwOldTimeList.size() - 1).getId()));
                         // 删除后面的任务
                         fosterwxTaskScheduleService.remove(new LambdaQueryWrapper<FosterwxTaskSchedule>().eq(FosterwxTaskSchedule::getStationId, oldVO.getStationId()).eq(FosterwxTaskSchedule::getMobileCode, oldVO.getMobileCode()).eq(FosterwxTaskSchedule::getType, 1).gt(FosterwxTaskSchedule::getSendDate, fosterwxMobileTaskTimeList.getTaskEndAt()));
                     }
@@ -342,7 +345,10 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
                     } else if (null != fosterwxMobileTaskTimeList.getTaskEndAt() && qwOldTimeList.get(qwOldTimeList.size() - 1).getTaskEndAt() == null) {
                         fosterwxMobileTaskTimeListService.update(new FosterwxMobileTaskTimeList() {{
                             setTaskEndAt(fosterwxMobileTaskTimeList.getTaskEndAt());
-                        }}, new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, fosterwxMobile.getMobileUnioCode()).eq(FosterwxMobileTaskTimeList::getType, 2));
+                        }}, new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().
+                                eq(FosterwxMobileTaskTimeList::getMobileUnioCode, fosterwxMobile.getMobileUnioCode()).
+                                eq(FosterwxMobileTaskTimeList::getType, 2).
+                                eq(FosterwxMobileTaskTimeList::getId, qwOldTimeList.get(qwOldTimeList.size() - 1).getId()));
                         // 删除后面的任务
                         fosterwxTaskScheduleService.remove(new LambdaQueryWrapper<FosterwxTaskSchedule>().eq(FosterwxTaskSchedule::getStationId, oldVO.getStationId()).eq(FosterwxTaskSchedule::getMobileCode, oldVO.getMobileCode()).eq(FosterwxTaskSchedule::getType, 2).gt(FosterwxTaskSchedule::getSendDate, fosterwxMobileTaskTimeList.getTaskEndAt()));
                     }