From 06d7fb698ce6d0efc7ff4224c6b68d2f50feb716 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 21 四月 2025 16:23:46 +0800
Subject: [PATCH] DO单修改及优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index 11a8dc0..5ed649b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -132,23 +132,30 @@
@PreAuthorize("hasAuthority('manager:task:update')")
@ApiOperation("瀹屾垚浠诲姟")
@PostMapping("/task/complete/{id}")
- public R completeTask(@PathVariable String id) {
+ public R completeTask(@PathVariable String id) throws Exception {
if (Objects.isNull(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
List<Long> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
- if (tasks.isEmpty()) {
- throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿畬鎴愶紒锛�");
- }
- try {
- taskService.completeTask(tasks);
- } catch (Exception ex) {
- return R.error("浠诲姟寮傚父锛屾棤娉曞畬鎴愶紒锛�");
+// if (tasks.isEmpty()) {
+// throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿畬鎴愶紒锛�");
+// }
+ taskService.completeTask(tasks);
+ return R.ok();
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:update')")
+ @ApiOperation("鍙栨秷浠诲姟")
+ @PostMapping("/task/cancel/{id}")
+ public R cancelTask(@PathVariable String id) {
+ if (Objects.isNull(id)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return R.ok();
}
+
@PreAuthorize("hasAuthority('manager:task:update')")
@ApiOperation("浠诲姟鍑哄簱缃《")
@PostMapping("/task/top/{id}")
--
Gitblit v1.9.1