fix bug
This commit is contained in:
parent
0eb27b87f8
commit
17c91becbe
|
|
@ -36,44 +36,42 @@ public class PlayletTaskAppController extends BaseController {
|
||||||
* 分页查询任务列表
|
* 分页查询任务列表
|
||||||
*/
|
*/
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
@PostMapping("/getItemList")
|
@PostMapping("/getTaskList")
|
||||||
@ApiOperation(value = "分页查询任务列表")
|
@ApiOperation(value = "分页查询任务列表")
|
||||||
public Result<PageInfo<PlayletTask>> getItemList(@RequestBody PlayletTask playletTask,
|
public Result<PageInfo<PlayletTask>> getTaskList(@RequestBody PlayletTask playletTask,
|
||||||
@RequestParam(value = "pageNum") Integer pageNum,
|
@RequestParam(value = "pageNum") Integer pageNum,
|
||||||
@RequestParam(value = "pageSize") Integer pageSize) {
|
@RequestParam(value = "pageSize") Integer pageSize) {
|
||||||
return Result.success(playletTaskAppService.getItemPage(playletTask, pageNum, pageSize));
|
return Result.success(playletTaskAppService.getTaskPage(playletTask, pageNum, pageSize));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页查询任务列表
|
* 分页查询任务列表
|
||||||
*/
|
*/
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
@PostMapping("/getItemList/list")
|
@PostMapping("/getTaskListByUser")
|
||||||
@ApiOperation(value = "分页查询用户任务列表")
|
@ApiOperation(value = "分页查询用户任务列表")
|
||||||
public Result<PageInfo<PlayletTask>> getItemListByUser(@RequestBody PlayletTask playletTask,
|
public Result<PageInfo<PlayletTask>> getTaskListByUser(@RequestBody PlayletTask playletTask,
|
||||||
@RequestParam(value = "pageNum") Integer pageNum,
|
@RequestParam(value = "pageNum") Integer pageNum,
|
||||||
@RequestParam(value = "pageSize") Integer pageSize) {
|
@RequestParam(value = "pageSize") Integer pageSize) {
|
||||||
return Result.success(playletTaskAppService.getItemPageByUser(playletTask, pageNum, pageSize));
|
return Result.success(playletTaskAppService.getTaskPageByUser(playletTask, pageNum, pageSize));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 任务详情
|
* 任务详情
|
||||||
*/
|
*/
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
@GetMapping("/load/{taskId}")
|
@GetMapping("/load")
|
||||||
@ApiOperation(value = "分页查询任务列表")
|
@ApiOperation(value = "查询任务详情")
|
||||||
public Result<PlayletTask> loadByTaskId(@PathVariable("taskId") Long taskId) {
|
public Result<PlayletTask> loadByTaskId(@RequestParam(value = "taskId") Long taskId) {
|
||||||
return Result.success(playletTaskAppService.selectPlayletTaskById(taskId));
|
return Result.success(playletTaskAppService.selectPlayletTaskById(taskId));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新增保存任务
|
* 新增保存任务
|
||||||
*/
|
*/
|
||||||
@RequiresPermissions("system:task:add")
|
@PostMapping("/addDesignate")
|
||||||
@Log(title = "用户任务新增", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping("/user/designate")
|
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxResult addSave(PlayletTask playletTask) {
|
public AjaxResult addSave(@RequestBody PlayletTask playletTask) {
|
||||||
return toAjax(playletTaskAppService.userDesignateTask(playletTask));
|
return toAjax(playletTaskAppService.userDesignateTask(playletTask));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,9 +13,9 @@ import java.util.List;
|
||||||
*/
|
*/
|
||||||
public interface PlayletTaskAppService {
|
public interface PlayletTaskAppService {
|
||||||
|
|
||||||
PageInfo<PlayletTask> getItemPage(PlayletTask playletTask, Integer pageSize, Integer pageNum);
|
PageInfo<PlayletTask> getTaskPage(PlayletTask playletTask, Integer pageSize, Integer pageNum);
|
||||||
|
|
||||||
PageInfo<PlayletTask> getItemPageByUser(PlayletTask playletTask, Integer pageSize, Integer pageNum);
|
PageInfo<PlayletTask> getTaskPageByUser(PlayletTask playletTask, Integer pageSize, Integer pageNum);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户选定任务
|
* 用户选定任务
|
||||||
|
|
|
||||||
|
|
@ -35,14 +35,14 @@ public class PlayletTaskAppServiceImpl implements PlayletTaskAppService {
|
||||||
private final IPlayletRevenueRecordService revenueRecordService;
|
private final IPlayletRevenueRecordService revenueRecordService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PageInfo<PlayletTask> getItemPage(PlayletTask playletTask, Integer pageSize, Integer pageNum) {
|
public PageInfo<PlayletTask> getTaskPage(PlayletTask playletTask, Integer pageSize, Integer pageNum) {
|
||||||
PageHelper.startPage(pageNum, pageSize);
|
PageHelper.startPage(pageNum, pageSize);
|
||||||
List<PlayletTask> revenueRecordList = playletTaskService.selectPlayletTaskList(playletTask);
|
List<PlayletTask> revenueRecordList = playletTaskService.selectPlayletTaskList(playletTask);
|
||||||
return PageInfo.of(revenueRecordList);
|
return PageInfo.of(revenueRecordList);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PageInfo<PlayletTask> getItemPageByUser(PlayletTask playletTask, Integer pageSize, Integer pageNum) {
|
public PageInfo<PlayletTask> getTaskPageByUser(PlayletTask playletTask, Integer pageSize, Integer pageNum) {
|
||||||
PageHelper.startPage(pageNum, pageSize);
|
PageHelper.startPage(pageNum, pageSize);
|
||||||
List<PlayletTask> revenueRecordList = playletTaskService.selectPlayletTaskListByUser(playletTask);
|
List<PlayletTask> revenueRecordList = playletTaskService.selectPlayletTaskListByUser(playletTask);
|
||||||
return PageInfo.of(revenueRecordList);
|
return PageInfo.of(revenueRecordList);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue