Merge branch 'fix-task-time'

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

@@ -250,9 +250,9 @@ 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()));
+                        }}, new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, fosterwxMobile.getMobileUnioCode()).eq(FosterwxMobileTaskTimeList::getType, 1));
                         // 删除后面的任务
-                        fosterwxTaskScheduleService.remove(new LambdaQueryWrapper<FosterwxTaskSchedule>().eq(FosterwxTaskSchedule::getStationId, oldVO.getStationId()).eq(FosterwxTaskSchedule::getMobileCode, oldVO.getMobileCode()).gt(FosterwxTaskSchedule::getSendDate, fosterwxMobileTaskTimeList.getTaskEndAt()));
+                        fosterwxTaskScheduleService.remove(new LambdaQueryWrapper<FosterwxTaskSchedule>().eq(FosterwxTaskSchedule::getStationId, oldVO.getStationId()).eq(FosterwxTaskSchedule::getMobileCode, oldVO.getMobileCode()).eq(FosterwxTaskSchedule::getType, 1).gt(FosterwxTaskSchedule::getSendDate, fosterwxMobileTaskTimeList.getTaskEndAt()));
                     }
                 }
             }
@@ -298,9 +298,9 @@ 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()));
+                        }}, new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, fosterwxMobile.getMobileUnioCode()).eq(FosterwxMobileTaskTimeList::getType, 2));
                         // 删除后面的任务
-                        fosterwxTaskScheduleService.remove(new LambdaQueryWrapper<FosterwxTaskSchedule>().eq(FosterwxTaskSchedule::getStationId, oldVO.getStationId()).eq(FosterwxTaskSchedule::getMobileCode, oldVO.getMobileCode()).gt(FosterwxTaskSchedule::getSendDate, fosterwxMobileTaskTimeList.getTaskEndAt()));
+                        fosterwxTaskScheduleService.remove(new LambdaQueryWrapper<FosterwxTaskSchedule>().eq(FosterwxTaskSchedule::getStationId, oldVO.getStationId()).eq(FosterwxTaskSchedule::getMobileCode, oldVO.getMobileCode()).eq(FosterwxTaskSchedule::getType, 2).gt(FosterwxTaskSchedule::getSendDate, fosterwxMobileTaskTimeList.getTaskEndAt()));
                     }
                 }
             }
@@ -327,7 +327,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
      * @return
      */
     @PostMapping("/addCashMobileList")
-    public Object addCashMobileList(@Valid @RequestBody SetIdsHandle setIdsHandle,BindingResult bindingResult) {
+    public Object addCashMobileList(@Valid @RequestBody SetIdsHandle setIdsHandle, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }