1、统计接口,增加已退回的数据
2、增加规则、任务、配置的历史状态变化表查询 3、任务结束后,其选择规则再次使用报错正在使用中问题解决。修改规则审计状态同时,删去used_tasl_id的值 4、任务结束,修改is——delete报错解决,doris要使用unique key 5、分页查询逆序返回
This commit is contained in:
@@ -262,9 +262,11 @@ public class TaskController implements TaskControllerApi {
|
||||
null, null, null, null,null,null,null,null))
|
||||
.setData("finished_num", taskService.queryTaskTotalNum(StateEnum.FINISHED.getStateNum(), null, null, null, null,
|
||||
null, null, null, null,null,null,null,null))
|
||||
.setData("unaudit_num", taskService.queryAuditTaskTotalNum(
|
||||
AuditStatusEnum.PENDING.getNum()
|
||||
));
|
||||
.setData("unaudit_num", taskService.queryAuditTaskTotalNum(AuditStatusEnum.PENDING.getNum()))
|
||||
.setData("audited_num", taskService.queryAuditTaskTotalNum(AuditStatusEnum.AUDITED.getNum()))
|
||||
.setData("rejected_num", taskService.queryAuditTaskTotalNum(AuditStatusEnum.RETURNED.getNum()))
|
||||
.setData("using_num", taskService.queryAuditTaskTotalNum(AuditStatusEnum.USING.getNum()));
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -285,5 +287,15 @@ public class TaskController implements TaskControllerApi {
|
||||
.setData("auditInfo", taskService.queryAuditInfo(id));
|
||||
}
|
||||
|
||||
@Override
|
||||
@GetMapping("/{id}/history")
|
||||
public ResponseResult queryHistory(@PathVariable Long id,
|
||||
@RequestParam(value = "page", required = true) Integer page,
|
||||
@RequestParam(value = "page_size", required = true) Integer pageSize) {
|
||||
|
||||
return ResponseResult.ok()
|
||||
.setData("history", taskService.queryHistory(id, page, pageSize));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user