qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

处理冲突

This commit is contained in:
Harryxzy 2025-04-22 16:54:11 +08:00
parent f638665b72
commit 30707de205
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/engine/salary/service/impl/SIAccountServiceImpl.java
View File

@ -5254,9 +5254,6 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
// 获取特殊人员社保福利档案数据 // 获取特殊人员社保福利档案数据
List<UfTsrysjsbfldaPO> ufTsrysjsbfldaList = ufTsrysjsbfldaListMap.get(k.intValue()); List<UfTsrysjsbfldaPO> ufTsrysjsbfldaList = ufTsrysjsbfldaListMap.get(k.intValue());
if (insuranceAccountDetailPO.getEmployeeId().equals(95L)) {
System.out.println("h");
}
//核算社保 //核算社保
accountSocial(insuranceAccountDetailPO, v, billMonth, ufTsrysjsbfldaList); accountSocial(insuranceAccountDetailPO, v, billMonth, ufTsrysjsbfldaList);
//核算公积金 //核算公积金
@ -7297,6 +7294,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
Map<Long, InsuranceArchivesAccountPO> insuranceArchivesAccountPOS = getSIArchivesService(user).buildBatchAccount(ids, paymentOrganization); Map<Long, InsuranceArchivesAccountPO> insuranceArchivesAccountPOS = getSIArchivesService(user).buildBatchAccount(ids, paymentOrganization);
List<DataCollectionEmployee> employeeList = getSalaryEmployeeService(user).listByIds(ids); List<DataCollectionEmployee> employeeList = getSalaryEmployeeService(user).listByIds(ids);
Map<Long, DataCollectionEmployee> employeeMap = SalaryEntityUtil.convert2Map(employeeList, DataCollectionEmployee::getEmployeeId); Map<Long, DataCollectionEmployee> employeeMap = SalaryEntityUtil.convert2Map(employeeList, DataCollectionEmployee::getEmployeeId);
// 获取这些员工的特殊人员社保福利档案数据
List<UfTsrysjsbfldaPO> ufTsrysjsbfldaPOS = getUfTsrysjsbfldaService(user).listByEmpIdsAndMonth(ids, billMonth);
Map<Integer, List<UfTsrysjsbfldaPO>> ufTsrysjsbfldaListMap = SalaryEntityUtil.group2Map(ufTsrysjsbfldaPOS, UfTsrysjsbfldaPO::getYg);
List<InsuranceAccountDetailTempPO> list = new ArrayList<>(); List<InsuranceAccountDetailTempPO> list = new ArrayList<>();
for (Map.Entry<Long, InsuranceArchivesAccountPO> entry : insuranceArchivesAccountPOS.entrySet()) { for (Map.Entry<Long, InsuranceArchivesAccountPO> entry : insuranceArchivesAccountPOS.entrySet()) {
@ -7328,10 +7328,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
insuranceAccountDetailPO.setStatus(employee.getStatus()); insuranceAccountDetailPO.setStatus(employee.getStatus());
} }
// 获取特殊人员社保福利档案数据
List<UfTsrysjsbfldaPO> 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); accountOther(insuranceAccountDetailPO, v, billMonth);
//计算合计 //计算合计