Merge branch 'dev-lqc' into test

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

@@ -71,10 +71,15 @@ public class FosterwxCashScheduleTaskListController extends BaseController<Foste
             Arrays.asList(handle.getIds().split(REGEX)).forEach(id -> fosterwxCashScheduleTaskListService.cancelTask(Integer.valueOf(id), user.getId()));
         } else {
             Arrays.asList(handle.getIds().split(REGEX)).forEach(id -> {
-                FosterwxCashScheduleTaskList fosterwxCashScheduleTaskList = fosterwxCashScheduleTaskListService.getById(id);
-                List<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListList = fosterwxCashScheduleTaskListService.list(new LambdaQueryWrapper<FosterwxCashScheduleTaskList>().eq(FosterwxCashScheduleTaskList::getTaskId, fosterwxCashScheduleTaskList.getTaskId()));
-
-                fosterwxCashScheduleTaskListList.forEach(detail -> fosterwxCashScheduleTaskListService.cancelTask(detail.getId(), user.getId()));
+                // 企微任务列表 页面的取消任务是全部取消 预览页面的取消任务是精准取消
+                if (handle.getIsAllDel() == 1) {
+                    FosterwxCashScheduleTaskList fosterwxCashScheduleTaskList = fosterwxCashScheduleTaskListService.getById(id);
+                    List<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListList = fosterwxCashScheduleTaskListService.list(new LambdaQueryWrapper<FosterwxCashScheduleTaskList>().eq(FosterwxCashScheduleTaskList::getTaskId, fosterwxCashScheduleTaskList.getTaskId()));
+
+                    fosterwxCashScheduleTaskListList.forEach(detail -> fosterwxCashScheduleTaskListService.cancelTask(detail.getId(), user.getId()));
+                } else {
+                    fosterwxCashScheduleTaskListService.cancelTask(Integer.valueOf(id), user.getId());
+                }
             });
         }
 

src/main/java/com/mokamrp/privates/entity/pangu/FosterwxCashScheduleTaskListHandle.java

@@ -27,4 +27,5 @@ public class FosterwxCashScheduleTaskListHandle {
     private LocalDateTime sendTimeTo;
     private Integer createUid;
     private String ids;
+    private Integer isAllDel = 1;
 }