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

修复社保福利档案导出，一个人在多个义务人下 导出bug

This commit is contained in:
Harryxzy 2024-11-05 11:04:21 +08:00
parent ea06150dc5
commit cb6738734a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/engine/salary/service/impl/SISchemeServiceImpl.java
View File

@ -742,6 +742,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
List<InsuranceArchivesSocialSchemePO> socialByEmployeeId = getSIArchivesService(user).getSocialByEmployeeIds(new ArrayList<Long>() {{
add(item.getEmployeeId());
}});
// 过滤义务人
socialByEmployeeId = socialByEmployeeId.stream().filter(s -> s.getPaymentOrganization().equals(item.getPaymentOrganization())).collect(Collectors.toList());
encryptUtil.decryptList(socialByEmployeeId, InsuranceArchivesSocialSchemePO.class);
InsuranceArchivesSocialSchemePO socialItem = null;
if (socialByEmployeeId.size() > 0) {
@ -752,6 +754,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
List<InsuranceArchivesFundSchemePO> fundByEmployeeId = getSIArchivesService(user).getFundByEmployeeIds(new ArrayList<Long>() {{
add(item.getEmployeeId());
}});
// 过滤义务人
fundByEmployeeId = fundByEmployeeId.stream().filter(f -> f.getPaymentOrganization().equals(item.getPaymentOrganization())).collect(Collectors.toList());
encryptUtil.decryptList(fundByEmployeeId, InsuranceArchivesFundSchemePO.class);
if (fundByEmployeeId.size() > 0) {
@ -762,6 +766,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
List<InsuranceArchivesOtherSchemePO> otherByEmployeeId = getSIArchivesService(user).getOtherByEmployeeIds(new ArrayList<Long>() {{
add(item.getEmployeeId());
}});
otherByEmployeeId = otherByEmployeeId.stream().filter(o -> o.getPaymentOrganization().equals(item.getPaymentOrganization())).collect(Collectors.toList());
encryptUtil.decryptList(otherByEmployeeId, InsuranceArchivesOtherSchemePO.class);
if (otherByEmployeeId.size() > 0) {
otherItem = otherByEmployeeId.get(0);