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

Merge remote-tracking branch 'origin/custom/上海港湾-多语言' into custom/上海港湾-多语言

This commit is contained in:
sy 2024-01-03 17:08:25 +08:00
parent 107df29229 8c6a9e192d
commit d9b87f0f5b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
View File

@ -1665,6 +1665,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
return pltxEmployeeDTO.builder().build();
}
List<SalaryArchivePO> salaryArchivePOS = getSalaryArchiveService(user).listSome(SalaryArchivePO.builder().employeeId(Long.valueOf(param.getXm())).taxAgentId(taxAgentPOList.get(0).getId()).build());
if (CollectionUtils.isEmpty(salaryArchivePOS)) {
return pltxEmployeeDTO.builder().build();
}
BaseBean baseBean = new BaseBean();
String salaryItemId = baseBean.getPropValue("shgwSalary", "pltxSalaryItemId");
List<SalaryArchiveItemPO> salaryArchiveItemList = getSalaryArchiveService(user).getCurrentEffectiveItemList(salaryArchivePOS.stream().map(SalaryArchivePO::getId).collect(Collectors.toList()), Collections.singletonList(Long.valueOf(salaryItemId)));