From 30707de205192c412a6af08b7cbdd605a44c69b3 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 22 Apr 2025 16:54:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/SIAccountServiceImpl.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index fec3c2e1d..956327580 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -5254,9 +5254,6 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { // 获取特殊人员社保福利档案数据 List ufTsrysjsbfldaList = ufTsrysjsbfldaListMap.get(k.intValue()); - if (insuranceAccountDetailPO.getEmployeeId().equals(95L)) { - System.out.println("h"); - } //核算社保 accountSocial(insuranceAccountDetailPO, v, billMonth, ufTsrysjsbfldaList); //核算公积金 @@ -7297,6 +7294,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { Map insuranceArchivesAccountPOS = getSIArchivesService(user).buildBatchAccount(ids, paymentOrganization); List employeeList = getSalaryEmployeeService(user).listByIds(ids); Map employeeMap = SalaryEntityUtil.convert2Map(employeeList, DataCollectionEmployee::getEmployeeId); + // 获取这些员工的特殊人员社保福利档案数据 + List ufTsrysjsbfldaPOS = getUfTsrysjsbfldaService(user).listByEmpIdsAndMonth(ids, billMonth); + Map> ufTsrysjsbfldaListMap = SalaryEntityUtil.group2Map(ufTsrysjsbfldaPOS, UfTsrysjsbfldaPO::getYg); List list = new ArrayList<>(); for (Map.Entry entry : insuranceArchivesAccountPOS.entrySet()) { @@ -7328,10 +7328,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { insuranceAccountDetailPO.setStatus(employee.getStatus()); } + // 获取特殊人员社保福利档案数据 + List ufTsrysjsbfldaList = ufTsrysjsbfldaListMap.get(k.intValue()); + //核算社保 - accountSocial(insuranceAccountDetailPO, v, billMonth); + accountSocial(insuranceAccountDetailPO, v, billMonth, ufTsrysjsbfldaList); //核算公积金 - accountFund(insuranceAccountDetailPO, v, billMonth); + accountFund(insuranceAccountDetailPO, v, billMonth, ufTsrysjsbfldaList); //核算其他福利 accountOther(insuranceAccountDetailPO, v, billMonth); //计算合计