From 55204060a168f92059dfad82ec0b80e36d12b833 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 12 十月 2024 12:08:20 +0800
Subject: [PATCH] 优化完成任务

---
 src/main/java/com/zy/asrs/task/TaskLogScheduler.java |   22 +++++++---------------
 1 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 3e48136..9c371ff 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -64,23 +64,8 @@
         for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
             HashMap<String, Object> headParam = new HashMap<>();
             if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)||taskWrk.getStatus()==7) {//瀹屾垚
-                //鍖哄垎鍏ュ嚭搴�
-                TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
-                if (!wrkLogService.insert(taskWrkLog)) {
-                    throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
-                }
-                if (!taskWrkService.deleteById(taskWrk)) {
-                    throw new CoolException("浠诲姟妗e垹闄ゅけ璐�" + taskWrkLog);
-                }
                 headParam.put("Result", 1);
             } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
-                TaskWrkLog taskWrkLog=new TaskWrkLog(taskWrk);
-                if(!wrkLogService.insert(taskWrkLog)){
-                    throw new CoolException("杞巻鍙叉。澶辫触"+taskWrkLog);
-                }
-                if(!taskWrkService.deleteById(taskWrk)){
-                    throw new CoolException("浠诲姟妗e垹闄ゅけ璐�"+taskWrkLog);
-                }
                 headParam.put("Result", 2);
             }
             String response = "";
@@ -97,6 +82,13 @@
                 JSONObject jsonObject = JSON.parseObject(response);
                 Boolean bool = false;
                 if(jsonObject.get("ReturnStatus").equals(0)){
+                    TaskWrkLog taskWrkLog=new TaskWrkLog(taskWrk);
+                    if(!wrkLogService.insert(taskWrkLog)){
+                        throw new CoolException("杞巻鍙叉。澶辫触"+taskWrkLog);
+                    }
+                    if(!taskWrkService.deleteById(taskWrk)){
+                        throw new CoolException("浠诲姟妗e垹闄ゅけ璐�"+taskWrkLog);
+                    }
                     bool = true;
                 }
                 apiLogService.save("wcs瀹屾垚鎴栬�呭彇娑堜换鍔′笂鎶ms"

--
Gitblit v1.9.1