From e67ab87058ea64c3a9d24df70f1b9a18a9f14a0e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 31 七月 2025 16:40:16 +0800
Subject: [PATCH] 调拔单功能优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java |   18 +++---------------
 1 files changed, 3 insertions(+), 15 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 24658cf..9c47abf 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
@@ -37,15 +37,6 @@
 
     @Autowired
     private TaskService taskService;
-    @Autowired
-    private TaskItemService taskItemService;
-    @Autowired
-    private WaitPakinService waitPakinService;
-    @Autowired
-    private LocService locService;
-    @Autowired
-    private ConfigServiceImpl configService;
-
 
     @PreAuthorize("hasAuthority('manager:task:list')")
     @PostMapping("/task/page")
@@ -101,15 +92,13 @@
     }
 
     @PreAuthorize("hasAuthority('manager:task:remove')")
-    @OperationLog("Delete 浠诲姟宸ヤ綔妗�")
+    @ApiOperation("鍙栨秷/鍒犻櫎宸ヤ綔鏋佹。")
     @PostMapping("/task/remove/{ids}")
-    @Transactional(rollbackFor = Exception.class)
     public R remove(@PathVariable Long[] ids) {
         if (Objects.isNull(ids) || ids.length < 1) {
             return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
         return taskService.removeTask(ids, getLoginUserId());
-//        return R.ok("Delete Success").add(ids);
     }
 
     @PreAuthorize("hasAuthority('manager:task:list')")
@@ -139,9 +128,8 @@
         if (Cools.isEmpty(id)) {
             throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
-        return R.ok("瀹屾垚浠诲姟鎴愬姛").add(taskService.operateComplete(id));
+        return R.ok("瀹屾垚浠诲姟鎴愬姛").add(taskService.operateComplete(id, getLoginUserId()));
     }
-
 
     /**
      * 鎷f枡鍑哄簱锛堢敤浜庢祴璇曟嫞鏂欏嚭搴擄級
@@ -198,7 +186,7 @@
             throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
         try {
-            taskService.taskToTop(id);
+            taskService.taskToTop(id, getLoginUserId());
         } catch (Exception e) {
             logger.error("UNK", e);
             throw new CoolException(e.getMessage());

--
Gitblit v1.9.1