From 8bfe1168a42d4e3750a15b0c0fb0a7629d6cf91c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 01 四月 2026 17:46:53 +0800
Subject: [PATCH] #日志清理与手动操作权限

---
 src/main/java/com/zy/asrs/controller/WrkMastController.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 51496f6..9ef23d0 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -7,10 +7,13 @@
 import com.core.common.DateUtils;
 import com.core.common.R;
 import com.zy.asrs.domain.param.CreateOutTaskBatchParam;
+import com.zy.asrs.domain.param.CancelTaskParam;
+import com.zy.asrs.domain.param.CompleteTaskParam;
 import com.zy.asrs.entity.WrkMast;
 import com.zy.asrs.service.WrkMastService;
 import com.zy.common.service.CommonService;
 import com.zy.common.web.BaseController;
+import com.zy.system.service.HighPrivilegeGrantService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +33,8 @@
     private WrkMastService wrkMastService;
     @Autowired
     private CommonService commonService;
+    @Autowired
+    private HighPrivilegeGrantService highPrivilegeGrantService;
 
     @RequestMapping(value = "/wrkMast/list/auth")
     @ManagerAuth
@@ -68,6 +73,26 @@
         return R.error("鐢熸垚鎵归噺鍑哄簱浠诲姟澶辫触");
     }
 
+    @PostMapping(value = "/wrkMast/complete/auth")
+    @ManagerAuth(memo = "宸ヤ綔妗e畬鎴愪换鍔�")
+    public R completeTask(@RequestBody CompleteTaskParam param) {
+        if (param == null) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖");
+        }
+        highPrivilegeGrantService.assertGranted(request.getHeader("token"), "瀹屾垚浠诲姟");
+        return commonService.completeTask(param) ? R.ok() : R.error("浠诲姟瀹屾垚澶辫触");
+    }
+
+    @PostMapping(value = "/wrkMast/cancel/auth")
+    @ManagerAuth(memo = "宸ヤ綔妗e彇娑堜换鍔�")
+    public R cancelTask(@RequestBody CancelTaskParam param) {
+        if (param == null) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖");
+        }
+        highPrivilegeGrantService.assertGranted(request.getHeader("token"), "鍙栨秷浠诲姟");
+        return commonService.cancelTask(param) ? R.ok() : R.error("浠诲姟鍙栨秷澶辫触");
+    }
+
     private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
         for (Map.Entry<String, Object> entry : map.entrySet()){
             String val = String.valueOf(entry.getValue());

--
Gitblit v1.9.1