From 293297ad7ff6c190b15af28f9dc9208dba559d7b Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Tue, 1 Aug 2023 15:37:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?=
 =?UTF-8?q?=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E7=BA=BF=E4=B8=8B=E5=AF=B9?=
 =?UTF-8?q?=E6=AF=94=E5=AF=BC=E5=85=A5=E5=88=86=E6=89=B9,=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/siaccount/bo/InsuranceComparisonResultBO.java     | 4 ++--
 src/com/engine/salary/service/impl/SIAccountServiceImpl.java | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java b/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java
index c24a2f513..e8ffcf358 100644
--- a/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java
+++ b/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java
@@ -129,7 +129,7 @@ public class InsuranceComparisonResultBO {
      */
     public static List<Map<String, Object>> buildComparisonTableData(List<AccountExportPO> accountExportPOS, List<ExcelAccountExportPO> excelAccountExportPOS, Map<Long, String> schemeIdNameMap) {
 
-        Map<String, List<ExcelAccountExportPO>> excelResultMap = SalaryEntityUtil.group2Map(excelAccountExportPOS, ExcelAccountExportPO::getWorkcode);
+        Map<Long, List<ExcelAccountExportPO>> excelResultMap = SalaryEntityUtil.group2Map(excelAccountExportPOS, ExcelAccountExportPO::getEmployeeId);
 //        Map<String, List<AccountExportPO>> acctResultMap = SalaryEntityUtil.group2Map(accountExportPOS, AccountExportPO::getWorkcode);
 
         List<TaxAgentPO> paymentList = MapperProxyFactory.getProxy(TaxAgentMapper.class).listAll();
@@ -172,7 +172,7 @@ public class InsuranceComparisonResultBO {
             map.put("otherSchemeName", schemeIdNameMap.get(accountExportPO.getOtherSchemeId()));
 
             //线下值
-            List<ExcelAccountExportPO> excelResultValueList = excelResultMap.get(accountExportPO.getWorkcode());
+            List<ExcelAccountExportPO> excelResultValueList = excelResultMap.get(accountExportPO.getEmployeeId());
             ExcelAccountExportPO excelAccountExportPO = new ExcelAccountExportPO();
             if (excelResultValueList != null && excelResultValueList.size() == 1) {
                 excelAccountExportPO = excelResultValueList.get(0);
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 97093a2ec..15ced811c 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -2381,7 +2381,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
                 getExcelInsuranceDetailMapper().batchDelByIds(idList);
             }
             //新增
-            getExcelInsuranceDetailMapper().batchSave(addCompareList);
+            List<List<ExcelInsuranceDetailPO>> partition = Lists.partition((List<ExcelInsuranceDetailPO>) addCompareList, 20);
+            partition.forEach(getExcelInsuranceDetailMapper()::batchSave);
+
+//            getExcelInsuranceDetailMapper().batchSave(addCompareList);
 
             apidatas.put("successCount", successCount);
             apidatas.put("errorCount", failCount);