From 5da3490a208be33f77ce79288c892b6ff5a0af72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 28 Mar 2023 18:33:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ota/service/impl/OtaBaCxAqcsServiceImpl.java       | 10 +++++++++-
 .../ota/service/impl/OtaBaCxJbxxServiceImpl.java       |  4 +++-
 .../ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java   |  2 ++
 .../ota/service/impl/OtaBaSjSjmbcxServiceImpl.java     |  1 +
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java
index a15d769fb..452839e8e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java
@@ -117,6 +117,14 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl<OtaBaCxAqcsMapper, OtaBa
         removeById(id);
     }
 
+    public void deleteByOtaId(String otaId) {
+        if (StringUtils.isNotEmpty(otaId)) {
+            LambdaQueryWrapper<OtaBaCxAqcs> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(OtaBaCxAqcs::getOtaId, otaId);
+            remove(queryWrapper);
+        }
+    }
+
     /**
      * 批量删除
      *
@@ -163,7 +171,7 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl<OtaBaCxAqcsMapper, OtaBa
     }
 
     private OtaBaCxAqcs getByOtaId(String otaId) {
-        if(StringUtils.isEmpty(otaId)){
+        if (StringUtils.isEmpty(otaId)) {
             return null;
         }
         LambdaQueryWrapper<OtaBaCxAqcs> queryWrapper = new LambdaQueryWrapper<>();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
index 50470134a..4664747a5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
@@ -77,10 +77,12 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
             otaBaCxJbxx.setCreateTime(now);
         } else {
             otaBaCxJbxxOld = this.getByOtaId(otaBaCxJbxx.getOtaId());
+            otaBaCxJbxx.setId(otaBaCxJbxx.getId());
             otaBaCxList = otaBaCxListService.queryById(otaBaCxJbxx.getOtaId());
             otaBaCxList.updateData(otaBaCxJbxx);
             otaBaCxListService.editById(otaBaCxList);
         }
+        otaBaCxJbxx.setOtaId(otaBaCxJbxx.getOtaId());
         otaBaCxJbxx.setUpdateTime(now);
         saveOrUpdate(otaBaCxJbxx);
         ComparisonUtil cu = new ComparisonUtil();
@@ -156,7 +158,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
     }
 
     private OtaBaCxJbxx getByOtaId(String otaId) {
-        if(StringUtils.isEmpty(otaId)){
+        if (StringUtils.isEmpty(otaId)) {
             return null;
         }
         LambdaQueryWrapper<OtaBaCxJbxx> queryWrapper = new LambdaQueryWrapper<>();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
index 7b1643198..90ed96f31 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
@@ -72,6 +72,8 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
         ComparisonUtil cu = new ComparisonUtil();
         if (ObjectUtils.isEmpty(otaBaCxJsfzbacsOld)) {
             otaBaCxJsfzbacsOld = new OtaBaCxJsfzbacs();
+        }else{
+            otaBaCxJsfzbacs.setId(otaBaCxJsfzbacsOld.getId());
         }
         List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaId, OtaModuleEnum.CX_JSFZXTJCBACS, otaBaCxJsfzbacsOld, otaBaCxJsfzbacs, sysDictService);
         saveOrUpdate(otaBaCxJsfzbacs);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
index 7d2ad60d2..ada9da65b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
@@ -60,6 +60,7 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, O
             otaBaSjSjmbcx.setCreateTime(now);
         } else {
             otaBaSjSjmbcxOld = this.getByOtaId(otaBaSjSjmbcx.getOtaId());
+            otaBaSjSjmbcx.setId(otaBaSjSjmbcxOld.getId());
             otaBaSjList = otaBaSjListService.queryById(otaBaSjSjmbcx.getOtaId());
             otaBaSjList.updateData(otaBaSjSjmbcx);
             otaBaSjListService.editById(otaBaSjList);