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

Merge branch 'release/2.9.6.2310.01' into release/个税版本

This commit is contained in:
钱涛 2023-10-20 10:56:07 +08:00
parent e19f00c44d a19f86c624
commit 1f5edd039a
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -897,7 +897,15 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
}
//20230707增加福利核算明细中的缴纳状态+合计的数据项
List<InsuranceAccountDetailPO> insuranceAccountDetailPOS = getInsuranceAccountDetailMapper().queryList(billMonth, taxAgentId, employeeIds);
// List<InsuranceAccountDetailPO> insuranceAccountDetailPOS = getInsuranceAccountDetailMapper().queryList(billMonth, taxAgentId, employeeIds);
List<InsuranceAccountDetailPO> insuranceAccountDetailPOS = new ArrayList<>();
List<List<Long>> empIdsPart = Lists.partition((List<Long>) employeeIds, 500);
for (List<Long> part : empIdsPart) {
insuranceAccountDetailPOS.addAll(
getInsuranceAccountDetailMapper().queryList(billMonth, taxAgentId, part));
}
//退差数据不参与薪资核算
insuranceAccountDetailPOS = insuranceAccountDetailPOS.stream()
.filter(f -> f.getPaymentStatus().equals(PaymentStatusEnum.COMMON.getValue())

8
src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
View File

@ -179,7 +179,13 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
if (CollectionUtils.isEmpty(salaryAcctRecordIds) || CollectionUtils.isEmpty(employeeIds)) {
return Collections.emptyList();
}
return getSalaryAcctEmployeeMapper().listSome(SalaryAcctEmployeePO.builder().salaryAcctRecordIds(salaryAcctRecordIds).employeeIds(employeeIds).build());
List<List<Long>> partition = Lists.partition((List<Long>) employeeIds, 500);
List<SalaryAcctEmployeePO> list = new ArrayList<>();
partition.forEach(l -> {
list.addAll(getSalaryAcctEmployeeMapper().listSome(SalaryAcctEmployeePO.builder().salaryAcctRecordIds(salaryAcctRecordIds).employeeIds(l).build()));
});
return list;
}
@Override