Merge remote-tracking branch 'remotes/origin/feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01

This commit is contained in:
sy 2022-11-04 11:08:54 +08:00
commit 65aff3e5be
1 changed files with 2 additions and 0 deletions

View File

@ -241,6 +241,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
List<TaxAgentEmpChangePO> taxAgentEmpChangeList = getTaxAgentEmpChangeService(user).listAllByModule(TaxAgentEmpChangeModuleEnum.INSURANCE_ARCHIVE);
log.info("待处理的福利档案增量数据数量 {}", taxAgentEmpChangeList.size());
if (CollectionUtils.isEmpty(taxAgentEmpChangeList)) {
Util_DataCache.setObjVal("welfareChangeSign", "0");
return;
}
// 当前可以管辖的人员
@ -248,6 +249,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
log.info("当前可以管辖的个税扣缴义务人数量 {}", taxAgentList.size());
taxAgentEmpChangeList = taxAgentEmpChangeList.stream().filter(f -> taxAgentList.stream().anyMatch(e -> e.getId().equals(f.getTaxAgentId()))).collect(Collectors.toList());
if (CollectionUtils.isEmpty(taxAgentEmpChangeList)) {
Util_DataCache.setObjVal("welfareChangeSign", "0");
return;
}
log.info("根据当前可以管辖的个税扣缴义务人筛选出的可处理增量数据数量 {}", taxAgentEmpChangeList.size());