From 028ef9e952135505871d7a05d9c3af3a8fbcce79 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期日, 11 五月 2025 15:18:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 43606c1..9741a32 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
@@ -177,8 +177,15 @@
// if (tasks.isEmpty()) {
// throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿畬鎴愶紒锛�");
// }
- taskService.completeTask(tasks);
- return R.ok();
+// taskService.completeTask(tasks);
+ for (Task task : tasks) {
+ task.setTaskStatus(task.getTaskType() < (short)100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
+ }
+ if (!taskService.updateBatchById(tasks)){
+ return R.error("瀹屾垚浠诲姟澶辫触");
+ }
+
+ return R.ok("瀹屾垚浠诲姟鎴愬姛");
}
@PreAuthorize("hasAuthority('manager:task:update')")
--
Gitblit v1.9.1