From 4d9b7af975965c008684d4a8cb2d4e94c0a31fa6 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Fri, 16 Sep 2022 14:21:15 +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=E5=AF=BC=E5=85=A5=E9=A1=B9=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=A4=BE=E4=BF=9D=E5=90=88=E8=AE=A1=E3=80=81=E5=85=AC?=
 =?UTF-8?q?=E7=A7=AF=E9=87=91=E5=90=88=E8=AE=A1=E3=80=81=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=90=88=E8=AE=A1=E3=80=81=E5=90=88=E8=AE=A1?=
 =?UTF-8?q?=E5=9B=9B=E4=B8=AA=E5=AD=97=E6=AE=B5=E5=8F=AF=E4=BB=A5=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=EF=BC=8C=E5=B9=B6=E5=A2=9E=E5=8A=A0=E8=BF=99=E5=9B=9B?=
 =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5=E7=9A=84=E6=9B=B4=E6=96=B0=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../siaccount/InsuranceAccountDetailMapper.xml      |  4 ++++
 .../salary/service/impl/SIAccountServiceImpl.java   | 13 +++++++++++++
 .../engine/salary/wrapper/SalaryFormulaWrapper.java |  6 ++++++
 3 files changed, 23 insertions(+)

diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
index 581080621..e41efcd8d 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
@@ -779,6 +779,10 @@
             <if test="null != fundComSum and '' != fundComSum">fund_com_sum = #{fundComSum},</if>
             <if test="null != otherComJson and '' != otherComJson">other_com_json = #{otherComJson},</if>
             <if test="null != otherComSum and '' != otherComSum">other_com_sum = #{otherComSum},</if>
+            <if test="null != socialSum and '' != socialSum">social_sum = #{socialSum},</if>
+            <if test="null != fundSum and '' != fundSum">fund_sum = #{fundSum},</if>
+            <if test="null != otherSum and '' != otherSum">other_sum = #{otherSum},</if>
+            <if test="null != total and '' != total">total = #{total},</if>
             <if test="null != updateTime">update_time = #{updateTime},</if>
 
         </set>
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 92da8c80f..19696a5d1 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -1386,6 +1386,19 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
             insuranceAccountDetailPO.setBillMonth(baseMap.get("账单月份").toString());
         }
 
+        if (!StringUtils.isEmpty(baseMap.getOrDefault("社保合计", "").toString())) {
+            insuranceAccountDetailPO.setSocialSum(baseMap.get("社保合计").toString());
+        }
+        if (!StringUtils.isEmpty(baseMap.getOrDefault("公积金合计", "").toString())) {
+            insuranceAccountDetailPO.setFundSum(baseMap.get("公积金合计").toString());
+        }
+        if (!StringUtils.isEmpty(baseMap.getOrDefault("其他福利合计", "").toString())) {
+            insuranceAccountDetailPO.setOtherSum(baseMap.get("其他福利合计").toString());
+        }
+        if (!StringUtils.isEmpty(baseMap.getOrDefault("合计", "").toString())) {
+            insuranceAccountDetailPO.setTotal(baseMap.get("合计").toString());
+        }
+
         insuranceAccountDetailPO.setUpdateTime(new Date());
 
         return insuranceAccountDetailPO;
diff --git a/src/com/engine/salary/wrapper/SalaryFormulaWrapper.java b/src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
index ddd692fad..5e66d5c9a 100644
--- a/src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
@@ -100,6 +100,12 @@ public class SalaryFormulaWrapper extends Service {
             welfareList.add(insuranceAcctDetailImportFieldDTO);
 
         }
+
+        welfareList.add(new InsuranceAcctDetailImportFieldDTO("社保合计"));
+        welfareList.add(new InsuranceAcctDetailImportFieldDTO("公积金合计"));
+        welfareList.add(new InsuranceAcctDetailImportFieldDTO("其他福利合计"));
+        welfareList.add(new InsuranceAcctDetailImportFieldDTO("合计"));
+
         return welfareList;
     }
 }