From d7ec100166068db8197d218c57d2a6c86a5289a4 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 04 十一月 2025 14:10:42 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 77bfc5e..1216a4a 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,16 +83,16 @@
} 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);
}
}
-
- EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+//
+// EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
+// excludeTrash(param);
+// convert(param, wrapper);
+// if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
List<TaskWrk> taskWrkList = taskWrkService.selectTaskWrkList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
Page<TaskWrk> page = new Page<TaskWrk>(curr, limit).setRecords(taskWrkList);
@@ -246,6 +246,8 @@
taskWrk.setMemo("鎵嬪姩寮哄埗鍒犻櫎锛侊紒锛�");
taskWrk.setModiTime(now);
taskWrk.setModiUser(getUserId());
+ taskWrk.setCompleteTime(now);
+ taskWrk.setCancelTime(now);
if (!taskWrkService.updateById(taskWrk)){
log.error("鍒犻櫎澶辫触" + taskWrk);
return R.error("鍒犻櫎澶辫触" + taskWrk);
@@ -309,6 +311,16 @@
@ManagerAuth(memo = "鎵嬪姩瀹屾垚浠诲姟")
public R complete(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (Cools.isEmpty(taskWrk)){
+ return R.error("浠诲姟宸蹭笉瀛樺湪") ;
+ }
+ if (taskWrk.getIoType()==4){
+ try{
+ return this.delete(taskNo);
+ } catch (Exception e) {
+ return R.error();
+ }
+ }
if ((Cools.isEmpty(taskWrk) || taskWrk.getStatus()>=3) && !taskWrk.getStatus().equals(TaskStatusType.OVER3.id)){
return R.error("宸插畬缁撴垨宸插彇娑�") ;
}
@@ -392,8 +404,15 @@
@ManagerAuth(memo = "鎵嬪姩鍙栨秷浠诲姟")
public R cancel(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
- if (taskWrk == null) {
- return R.error();
+ if (Cools.isEmpty(taskWrk)){
+ return R.error("浠诲姟宸蹭笉瀛樺湪") ;
+ }
+ if (taskWrk.getIoType()==4){
+ try{
+ return this.delete(taskNo);
+ } catch (Exception e) {
+ return R.error();
+ }
}
if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
return R.error(taskWrk.getTaskNo() + "宸茶鍙栨秷");
@@ -483,6 +502,12 @@
@ManagerAuth(memo = "杈撻�佺嚎涓嬪彂瀹屾垚")
public R returnAssign(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (Cools.isEmpty(taskWrk)){
+ return R.error("浠诲姟宸蹭笉瀛樺湪") ;
+ }
+ if (taskWrk.getIoType()==4){
+ return R.error("褰撳墠浠诲姟涓嶆敮鎸佹鎿嶄綔") ;
+ }
if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==1){
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//娲惧彂鐘舵��
taskWrk.setWrkSts(2);
--
Gitblit v1.9.1