Merge branch 'release/个税版本' into release/个税&业务线
This commit is contained in:
commit
96f88e1eec
|
|
@ -1531,7 +1531,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setExistedDataMap(AddUpDeductionOnlineRequestWrapper requestWrapper) {
|
private void setExistedDataMap(AddUpDeductionOnlineRequestWrapper requestWrapper) {
|
||||||
List<Long> taxAgentIds = SalaryEntityUtil.properties(requestWrapper.getSalaryArchiveList(), SalaryArchivePO::getTaxAgentId, Collectors.toList());
|
Set<Long> taxAgentIds = SalaryEntityUtil.properties(requestWrapper.getSalaryArchiveList(), SalaryArchivePO::getTaxAgentId);
|
||||||
List<AddUpDeduction> poList = getAddUpDeductionMapper().listSome(AddUpDeduction.builder().declareMonth(requestWrapper.getRequestPOList().get(0).getTaxYearMonth()).taxAgentIds(taxAgentIds).build());
|
List<AddUpDeduction> poList = getAddUpDeductionMapper().listSome(AddUpDeduction.builder().declareMonth(requestWrapper.getRequestPOList().get(0).getTaxYearMonth()).taxAgentIds(taxAgentIds).build());
|
||||||
requestWrapper.setExistedDataMap(SalaryEntityUtil.convert2Map(poList, e -> e.getTaxAgentId() + "-" + e.getEmployeeId(), AddUpDeduction::getId));
|
requestWrapper.setExistedDataMap(SalaryEntityUtil.convert2Map(poList, e -> e.getTaxAgentId() + "-" + e.getEmployeeId(), AddUpDeduction::getId));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue