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

金华交投 - 流程审批导入排序

This commit is contained in:
Harryxzy 2024-09-11 10:21:06 +08:00
parent d38775a32f
commit b3d717cd1b
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,6 +222,12 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
return getSalaryAcctEmployeeMapper().list(queryParam);
}
public List<SalaryAcctEmployeePO> listByParam4jh(SalaryAcctEmployeeQueryParam queryParam) {
List<SalaryAcctEmployeePO> salaryAcctEmployeePOList = getSalaryAcctEmployeeMapper().listPage4jh(queryParam);
salaryAcctEmployeePOList = salaryAcctEmployeePOList.stream().sorted(Comparator.comparing(SalaryAcctEmployeePO::getSalarySobId)).collect(Collectors.toList());
return salaryAcctEmployeePOList;
}
@Override
public PageInfo<SalaryAcctEmployeePO> listPageByResultQueryParam(SalaryAcctResultQueryParam queryParam) {
ValidUtil.doValidator(queryParam);
@ -248,7 +254,11 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
if (StringUtils.isNotEmpty(queryParam.getConsolidatedTaxation())) {
salaryAcctEmployeePOS = listByParam4ConsolidatedTax(salaryAcctEmployeeQueryParam);
} else {
salaryAcctEmployeePOS = listByParam(salaryAcctEmployeeQueryParam);
if (CollectionUtils.isNotEmpty(queryParam.getSalaryAcctRecordIds())) {
salaryAcctEmployeePOS = listByParam4jh(salaryAcctEmployeeQueryParam);
} else {
salaryAcctEmployeePOS = listByParam(salaryAcctEmployeeQueryParam);
}
}
return salaryAcctEmployeePOS;
}