From b5d5c6153617f6d1b9c6cd34cccaa6248fed7936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 30 Mar 2023 11:45:41 +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

---
 .../impl/OtaBaSjSjmbcxServiceImpl.java        |  5 +++-
 .../impl/OtaBaSjSjyxpgServiceImpl.java        | 30 +++++++++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

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 44dea6f27..35aad036a 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
@@ -90,9 +90,12 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, O
             otaBaSjListService.editById(otaBaSjList);
         }
         otaBaSjSjmbcx.setUpdateTime(now);
-        saveOrUpdate(otaBaSjSjmbcx);
         ComparisonUtil cu = new ComparisonUtil();
         List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaBaSjSjmbcx.getOtaId(), OtaModuleEnum.SJ_SJMBCX, otaBaSjSjmbcxOld, otaBaSjSjmbcx, sysDictService);
+        if (StringUtils.isEmpty(otaBaSjSjmbcx.getQymc())) {
+            otaBaSjSjmbcx.setQymc("安徽江淮汽车集团股份有限公司");
+        }
+        saveOrUpdate(otaBaSjSjmbcx);
         otaBaCxTxjlService.saveBatch(reList);
         return otaBaSjSjmbcx;
     }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java
index 37ce93468..a3607d886 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java
@@ -16,8 +16,6 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.apache.poi.xwpf.usermodel.XWPFTable;
-import org.apache.poi.xwpf.usermodel.XWPFTableCell;
-import org.apache.poi.xwpf.usermodel.XWPFTableRow;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -85,7 +83,6 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl<OtaBaSjSjyxpgMapper, O
                 otaBaSjSjyxpg.setCreateTime(now);
             }
             otaBaSjSjyxpg.setUpdateTime(now);
-            saveOrUpdate(otaBaSjSjyxpg);
             ComparisonUtil cu = new ComparisonUtil();
             if (ObjectUtils.isEmpty(otaBaSjSjyxpgOld)) {
                 otaBaSjSjyxpgOld = new OtaBaSjSjyxpg();
@@ -93,6 +90,33 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl<OtaBaSjSjyxpgMapper, O
             List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), OtaModuleEnum.SJ_SJYXPG, otaBaSjSjyxpgOld, otaBaSjSjyxpg, sysDictService);
             reList.addAll(cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), newYzcl, oldYzcl, OtaModuleEnum.SJ_SJMBCL, "验证材料", ossFileService));
             reList.addAll(cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), newZmcl, oldZmcl, OtaModuleEnum.SJ_SJMBCL, "证明材料", ossFileService));
+
+            if (null == otaBaSjSjyxpg.getFhgd()) {
+                otaBaSjSjyxpg.setFhgd(2);
+            }
+            if (null == otaBaSjSjyxpg.getZdjsxg()) {
+                otaBaSjSjyxpg.setZdjsxg(1);
+            }
+            if (null == otaBaSjSjyxpg.getZxsj()) {
+                otaBaSjSjyxpg.setZxsj(2);
+            }
+            if (StringUtils.isEmpty(otaBaSjSjyxpg.getAqjz())) {
+                otaBaSjSjyxpg.setAqjz("2");
+            }
+            if (null == otaBaSjSjyxpg.getSfyxaq()) {
+                otaBaSjSjyxpg.setSfyxaq(2);
+            }
+
+            if (null == otaBaSjSjyxpg.getYhqr()) {
+                otaBaSjSjyxpg.setYhqr(1);
+            }
+            if (StringUtils.isEmpty(otaBaSjSjyxpg.getSjbcs())) {
+                otaBaSjSjyxpg.setSjbcs("3,4");
+            }
+            if (null == otaBaSjSjyxpg.getAqkkx()) {
+                otaBaSjSjyxpg.setAqkkx(1);
+            }
+            saveOrUpdate(otaBaSjSjyxpg);
             otaBaCxTxjlService.saveBatch(reList);
         }
     }