From 66942458f7753fe4ddee7c5ed3386d61cff28b24 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 01 四月 2025 13:55:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index df10756..b9b6763 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -165,12 +165,12 @@
return R.ok();
}
- @PostMapping(value = "/taskWrk/distribute/auth")
- @ManagerAuth(memo = "鎵嬪姩娲惧彂浠诲姟")
- public R distribute(@RequestParam String taskNo) {
- taskWrkService.distribute(taskNo, getUserId());
- return R.ok();
- }
+// @PostMapping(value = "/taskWrk/distribute/auth")
+// @ManagerAuth(memo = "鎵嬪姩娲惧彂浠诲姟")
+// public R distribute(@RequestParam String taskNo) {
+// taskWrkService.distribute(taskNo, getUserId());
+// return R.ok();
+// }
@PostMapping(value = "/taskWrk/complete/auth")
@ManagerAuth(memo = "鎵嬪姩瀹屾垚浠诲姟")
@@ -247,6 +247,29 @@
return R.ok();
}
+ @PostMapping(value = "/taskWrk/returnWorkingCondition/auth")
+ @ManagerAuth(memo = "閲嶆柊缁欏爢鍨涙満涓嬪彂浠诲姟")
+ public R returnWorkingCondition(@RequestParam String taskNo) {
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==12){
+ taskWrk.setWrkSts(11);
+ if(!taskWrkService.updateById(taskWrk)){
+ return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
+ }
+ return R.ok();
+ } else if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==3) {
+ taskWrk.setWrkSts(2);
+ taskWrkService.updateById(taskWrk);
+ if(!taskWrkService.updateById(taskWrk)){
+ return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
+ }
+ return R.ok();
+ }else{
+ return R.error("浠诲姟鐘舵�佷笉瀵规棤娉曢噸鏂扮粰鍫嗗灈鏈轰笅鍙戜换鍔�");
+ }
+
+ }
+
@PostMapping(value = "/taskWrk/cancel/auth")
@ManagerAuth(memo = "鎵嬪姩鍙栨秷浠诲姟")
public R cancel(@RequestParam String taskNo) {
--
Gitblit v1.9.1