From fe4e13831759a5743caa880219ad8ab7cbb5946a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 23 Oct 2023 14:44:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E8=B0=83=E5=B7=AE=E7=B4=AF?=
 =?UTF-8?q?=E8=AE=A1=E5=AD=97=E6=AE=B5=E5=AF=B9=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/impl/TaxDeclareRecordServiceImpl.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
index eefc505e6..71baa2d0b 100644
--- a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
@@ -283,7 +283,8 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
         deleteByIds(needDeleteTaxDeclareRecordIds);
         // 保存个税申报记录
         if (CollectionUtils.isNotEmpty(newTaxDeclareRecords)) {
-            getTaxDeclareRecordMapper().batchInsert(newTaxDeclareRecords);
+            newTaxDeclareRecords.forEach(getTaxDeclareRecordMapper()::insertIgnoreNull);
+//            getTaxDeclareRecordMapper().batchInsert(newTaxDeclareRecords);
         }
         // 保存个税申报表
         if (CollectionUtils.isNotEmpty(newTaxDeclarations)) {
@@ -431,7 +432,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
         // 如果存在未归档的薪资核算记录，不允许生成个税申报表
         boolean notArchived = salaryAcctRecords.stream().anyMatch(salaryAcctRecordPO -> Objects.equals(salaryAcctRecordPO.getStatus(), SalaryAcctRecordStatusEnum.NOT_ARCHIVED.getValue()));
         if (notArchived) {
-            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98875, "{0}有未归档数据，请全部归档后再申报").replace("{0}", saveParam.getSalaryMonth().toString()));
+            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98875, "{0}有未归档数据，请全部归档后再申报").replace("{0}", SalaryDateUtil.getFormatYearMonth(saveParam.getSalaryMonth())));
         }
         // 查询已归档的薪资核算记录
         List<SalaryAcctRecordPO> archivedSalaryAcctRecords = salaryAcctRecords.stream().filter(salaryAcctRecordPO -> Objects.equals(salaryAcctRecordPO.getStatus(), SalaryAcctRecordStatusEnum.ARCHIVED.getValue())).collect(Collectors.toList());