|
@@ -41,13 +41,7 @@ public class TBTaskHistoryController {
|
|
@ApiOperation(value = "任务查询接口")
|
|
@ApiOperation(value = "任务查询接口")
|
|
@RequestMapping(value = "/query", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/query", method = RequestMethod.POST)
|
|
@ApiResponses({@ApiResponse(code = 200, message = "任务信息", response = TBTaskDto.class)})
|
|
@ApiResponses({@ApiResponse(code = 200, message = "任务信息", response = TBTaskDto.class)})
|
|
- public Result query(@ApiParam(value = "任务id", required = false) @RequestParam(required = false) Long id, @ApiParam(value = "业务对象id", required = false) @RequestParam(required = false) Long entityId, @ApiParam(value = "任务类型", required = true) @RequestParam TaskTypeEnum type, @ApiParam(value = "任务状态", required = false) @RequestParam(required = false) TaskStatusEnum status, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
|
|
|
|
- if (Objects.isNull(type) || Objects.equals(type, "")) {
|
|
|
|
- throw new BusinessException(ExceptionResultEnum.TASK_TYPE_IS_NULL);
|
|
|
|
- }
|
|
|
|
- if (Objects.isNull(TaskTypeEnum.valueOf(type.name()))) {
|
|
|
|
- throw new BusinessException(ExceptionResultEnum.TASK_TYPE_ERROR);
|
|
|
|
- }
|
|
|
|
|
|
+ public Result query(@ApiParam(value = "任务id", required = false) @RequestParam(required = false) Long id, @ApiParam(value = "业务对象id", required = false) @RequestParam(required = false) Long entityId, @ApiParam(value = "任务类型", required = false) @RequestParam(required = false) TaskTypeEnum type, @ApiParam(value = "任务状态", required = false) @RequestParam(required = false) TaskStatusEnum status, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
|
|
IPage<TBTaskDto> taskDtoIPage = tbTaskHistoryService.taskQuery(new Page<>(pageNumber, pageSize), id, entityId, type, status);
|
|
IPage<TBTaskDto> taskDtoIPage = tbTaskHistoryService.taskQuery(new Page<>(pageNumber, pageSize), id, entityId, type, status);
|
|
BasePage basePage = new BasePage(taskDtoIPage.getRecords(), taskDtoIPage.getCurrent(), taskDtoIPage.getSize(), taskDtoIPage.getTotal());
|
|
BasePage basePage = new BasePage(taskDtoIPage.getRecords(), taskDtoIPage.getCurrent(), taskDtoIPage.getSize(), taskDtoIPage.getTotal());
|
|
Map map = new HashMap<>();
|
|
Map map = new HashMap<>();
|