From 01458b9a92e41e7f7535f37954ff69b5f6f8511c Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Fri, 6 Jan 2023 20:15:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java   | 2 +-
 .../main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java
index dd4d38a..959b037 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java
@@ -166,7 +166,7 @@ public class TaskFeedbackServiceImpl implements TaskFeedbackService {
         TaskFeedbackDto dto = this.findById(id);
         TaskDto entity = taskService.findById(dto.getTask_id());
         JSONObject feed_jo = new JSONObject();
-        feed_jo.put("task_id", entity.getTask_id());
+        feed_jo.put("ext_task_id", entity.getTask_id());
         feed_jo.put("task_code", entity.getTask_code());
         feed_jo.put("task_status", entity.getTask_status());
         JSONArray ja = new JSONArray();
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
index 4400827..eda1bf0 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
@@ -542,7 +542,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
         if (!StrUtil.startWith(dto.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) {
             TaskFeedbackDto feefbackdto = taskFeedbackService.findByCode(entity.getTask_code());
             JSONObject feed_jo = new JSONObject();
-            feed_jo.put("task_id", entity.getTask_id());
+            feed_jo.put("ext_task_id", entity.getTask_id());
             feed_jo.put("task_code", dto.getTask_code());
             feed_jo.put("task_status", dto.getTask_status());
             JSONArray ja = new JSONArray();