From 82dadf2e9fbd30756ccd419a17cda9d41c6a032b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 24 九月 2024 14:50:58 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java
index 1c03feb..84a8161 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java
@@ -36,7 +36,7 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
- QueryWrapper<Task> wrapper = pageParam.buildWrapper(true);
+ QueryWrapper<Task> wrapper = pageParam.buildWrapper(true, "io_time");
if (hasCreateTimeDesc(pageParam.getOrders())) {
wrapper.last(businessSortService.getOrderBySql(TaskStsType.class, "task_sts"));
}
@@ -117,4 +117,19 @@
ExcelUtil.build(ExcelUtil.create(taskService.list(), Task.class), response);
}
+ @PreAuthorize("hasAuthority('manager:task:update')")
+ @OperationLog("Complete Task")
+ @GetMapping("/task/complete/{id}")
+ public R complete(@PathVariable Long id) {
+ return taskService.complete(id, getLoginUserId()) ? R.ok("Complete Success") : R.error("Complete Fail");
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:update')")
+ @OperationLog("Cancel Task")
+ @GetMapping("/task/cancel/{id}")
+ public R cancel(@PathVariable Long id) {
+ return taskService.cancel(id, getLoginUserId()) ? R.ok("Cancel Success") : R.error("Cancel Fail");
+ }
+
+
}
--
Gitblit v1.9.1