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