Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

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<>();

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<>();

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);

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);