From b3d717cd1b0bbd8aa783ed5b6db5ce3c6ada4c3f Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 11 Sep 2024 10:21:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E5=8D=8E=E4=BA=A4=E6=8A=95=20-=20?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=A1=E6=89=B9=E5=AF=BC=E5=85=A5=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SalaryAcctEmployeeServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java index 88e8de324..54f91e235 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java @@ -222,6 +222,12 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct return getSalaryAcctEmployeeMapper().list(queryParam); } + public List listByParam4jh(SalaryAcctEmployeeQueryParam queryParam) { + List salaryAcctEmployeePOList = getSalaryAcctEmployeeMapper().listPage4jh(queryParam); + salaryAcctEmployeePOList = salaryAcctEmployeePOList.stream().sorted(Comparator.comparing(SalaryAcctEmployeePO::getSalarySobId)).collect(Collectors.toList()); + return salaryAcctEmployeePOList; + } + @Override public PageInfo 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; }