|
@@ -1,5 +1,6 @@
|
|
|
package com.mokamrp.privates.controller.pangu;
|
|
package com.mokamrp.privates.controller.pangu;
|
|
|
|
|
|
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.mokamrp.privates.constant.HttpStatus;
|
|
import com.mokamrp.privates.constant.HttpStatus;
|
|
|
import com.mokamrp.privates.controller.BaseController;
|
|
import com.mokamrp.privates.controller.BaseController;
|
|
|
import com.mokamrp.privates.entity.ResHandle;
|
|
import com.mokamrp.privates.entity.ResHandle;
|
|
@@ -58,9 +59,18 @@ public class FosterwxCashScheduleTaskListController extends BaseController<Foste
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("/cancelTask")
|
|
@PostMapping("/cancelTask")
|
|
|
- @ApiOperation(value = "取消任务按钮")
|
|
|
|
|
|
|
+ @ApiOperation(value = "取消任务按钮 企微的情况新增type传输")
|
|
|
public Object cancelTask(@RequestBody FosterwxCashScheduleTaskListHandle handle, @AuthUser User user) {
|
|
public Object cancelTask(@RequestBody FosterwxCashScheduleTaskListHandle handle, @AuthUser User user) {
|
|
|
- Arrays.asList(handle.getIds().split(REGEX)).forEach(id -> fosterwxCashScheduleTaskListService.cancelTask(Integer.valueOf(id), user.getId()));
|
|
|
|
|
|
|
+ if (handle.getType() == 1) {
|
|
|
|
|
+ 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()));
|
|
|
|
|
+ });
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
return AjaxResult.success("取消任务成功");
|
|
return AjaxResult.success("取消任务成功");
|
|
|
}
|
|
}
|