From a75db9aa9aeaeeb40a15e55c1f17122b3d7c7421 Mon Sep 17 00:00:00 2001
From: ynhfasrs <ynhfasrs@qq.com>
Date: 星期五, 15 八月 2025 10:11:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 252b1a3..8ed00aa 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -155,10 +155,17 @@
@ManagerAuth(memo = "鎵嬪姩瀹屾垚浠诲姟")
public R complete(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
- if (Cools.isEmpty(taskWrk) || taskWrk.getStatus() >= 3) {
- return R.error("宸插畬缁撴垨宸插彇娑�");
+// if (Cools.isEmpty(taskWrk) || taskWrk.getStatus() >= 3) {
+// return R.error("宸插畬缁撴垨宸插彇娑�");
+// }
+ if (taskWrk.getIoType() == 1) {
+ taskWrk.setWrkSts(4);
+ }else if (taskWrk.getIoType() == 2) {
+ taskWrk.setWrkSts(14);
+ }else {
+ return R.error("浠诲姟鐘舵�佷笉瀛樺湪");
}
- taskWrk.setStatus(TaskStatusType.MANUAL_OVER.id);//鎵嬪姩瀹屾垚浠诲姟
+ taskWrk.setStatus(TaskStatusType.OVER.id);//鎵嬪姩瀹屾垚浠诲姟
taskWrk.setModiTime(new Date());
taskWrkService.updateById(taskWrk);
return R.ok();
--
Gitblit v1.9.1