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 @@ fund_com_sum = #{fundComSum}, other_com_json = #{otherComJson}, other_com_sum = #{otherComSum}, + social_sum = #{socialSum}, + fund_sum = #{fundSum}, + other_sum = #{otherSum}, + total = #{total}, update_time = #{updateTime}, 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; } }