From c1ef2d1fc4c0dae2bc8452924dcd77a0ff3a1ef5 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 19 六月 2025 15:02:52 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 6 +++---
1 files changed, 3 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 e78a475..58e205d 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -68,7 +68,7 @@
try{
Integer wrkNo = null;
- Integer taskNo = null;
+ String taskNo = null;
Integer status = null;
Date modiTimeStart = null, modiTimeEnd = null;
for (Map.Entry<String, Object> entry : param.entrySet()) {
@@ -83,7 +83,7 @@
} else if (entry.getKey().equals("wrk_no")) {
wrkNo = Integer.parseInt(val);
} else if (entry.getKey().equals("task_no")) {
- taskNo = Integer.parseInt(val);
+ taskNo = val;
} else if (entry.getKey().equals("status")) {
status = Integer.parseInt(val);
}
@@ -309,7 +309,7 @@
@ManagerAuth(memo = "鎵嬪姩瀹屾垚浠诲姟")
public R complete(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
- if (Cools.isEmpty(taskWrk) || taskWrk.getStatus()>=3){
+ if ((Cools.isEmpty(taskWrk) || taskWrk.getStatus()>=3) && !taskWrk.getStatus().equals(TaskStatusType.OVER3.id)){
return R.error("宸插畬缁撴垨宸插彇娑�") ;
}
LocMast locMast=new LocMast();
--
Gitblit v1.9.1