From 10f91cf8cc7f5ebe1cb4d9f06bd9cf4693277dc6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 21 十一月 2024 09:17:45 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 d186ab1..9dbade9 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
@@ -12,7 +12,6 @@
import com.zy.acs.manager.common.utils.BusinessSortService;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.manager.entity.Task;
-import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.service.TaskService;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +37,7 @@
PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
QueryWrapper<Task> wrapper = pageParam.buildWrapper(true, "io_time");
if (hasCreateTimeDesc(pageParam.getOrders())) {
- wrapper.last(businessSortService.getOrderBySql(TaskStsType.class, "task_sts"));
+// wrapper.last(businessSortService.getOrderBySql(TaskStsType.class, "task_sts"));
}
return R.ok().add(taskService.page(pageParam, wrapper));
}
@@ -117,4 +116,18 @@
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