From 978ba42f365c7a129d017e0bacdff28fd0364b08 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期一, 30 六月 2025 14:22:58 +0800
Subject: [PATCH] #改造

---
 src/main/java/com/zy/asrs/controller/TaskWrkController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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..05e592c 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);
                 }
@@ -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);

--
Gitblit v1.9.1