From 44abed99270e780bea37c5c781be43b827563f7a Mon Sep 17 00:00:00 2001
From: Chujinwang <17638147107@163.com>
Date: Fri, 9 Aug 2024 09:53:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PollingTaskServiceImpl.java    |  2 +-
 .../service/impl/TerminalServiceImpl.java       | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java
index 5e189fd..0e360fb 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java
@@ -346,7 +346,7 @@ public class PollingTaskServiceImpl extends ServiceImpl<PollingTaskMapper, Polli
             max = max == null ? 1 : max + 1;
             task.setSearchNum(max + "-");
             task.setSearchIndex(max);
-            task.setLevel(max);
+            task.setLevel(1);
         }
     }
 
diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java
index 7f82326..f831a90 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java
@@ -194,15 +194,20 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, Terminal> i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public long updateTerminalAndStore(TerminalQuery query) {
-        /**
-         * 当前终端
-         */
         Terminal curTerminal = getById(query.getTerminalId());
         AssertUtil.invalidate(ObjectUtil.isEmpty(curTerminal), "未找寻到对应的终端信息");
-        Terminal terminal = BeanCopyUtils.copy(query, Terminal.class);
-        updateById(terminal);
-        Store store = BeanCopyUtils.copy(query, Store.class);
+        curTerminal.setTerminalNo(query.getTerminalNo());
+        curTerminal.setTerminalSn(query.getTerminalSn());
+        curTerminal.setTerminalAddress(query.getTerminalAddress());
+        curTerminal.setTerminalModel(query.getTerminalModel());
+        curTerminal.setTerminalType(query.getTerminalType());
+        curTerminal.setTerminalSource(query.getTerminalSource());
+        updateById(curTerminal);
+        Store store = new Store();
         store.setStoreId(curTerminal.getStoreId());
+        store.setStoreNo(query.getStoreNo());
+        store.setStoreName(query.getStoreName());
+        store.setState(query.getStoreState());
         storeService.updateById(store);
         return query.getTerminalId();
     }