From d4bc0b1c8a754b32e59bed93de6754786b5ee074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 26 Nov 2025 17:39:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E6=A1=A3=E6=A1=88=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/wrapper/SalaryStatisticsEmployeeWrapper.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java index 711ea69c6..3d7644d6e 100644 --- a/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java +++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java @@ -414,7 +414,7 @@ public class SalaryStatisticsEmployeeWrapper extends Service { .employeeIds(Collections.singletonList((long) user.getUID())) .build(); List salaryAcctEmployeeList = getSalaryAcctEmployeeService(user).listByParam(salaryAcctEmployeeQueryParam); - salaryAcctEmployeeList = salaryAcctEmployeeList.stream().sorted((a,b)->-a.getSalaryMonth().compareTo(b.getSalaryMonth())).collect(Collectors.toList()); + salaryAcctEmployeeList = salaryAcctEmployeeList.stream().sorted((a, b) -> -a.getSalaryMonth().compareTo(b.getSalaryMonth())).collect(Collectors.toList()); // 获取薪资核算结果 SalaryStatisticsEmployeeDetailResultDTO salaryStatisticsEmployeeDetailResult = getSalaryStatisticsEmployeeService(user).getDetailSalaryAcctResultByAcctEmp(salaryAcctEmployeeList); @@ -431,8 +431,11 @@ public class SalaryStatisticsEmployeeWrapper extends Service { String salaryItemIds = new BaseBean().getPropValue("xbxtSalaryReport", "salaryItemIds"); List ids = Arrays.stream(salaryItemIds.split(",")).map(Long::valueOf).collect(Collectors.toList()); List salaryItemList = getSalaryItemService(user).listByIds(ids); - List salaryItemCols = salaryItemList + Map longSalaryItemPOMap = SalaryEntityUtil.convert2Map(salaryItemList, SalaryItemPO::getId); + List salaryItemCols = ids .stream() + .map(longSalaryItemPOMap::get) + .filter(Objects::nonNull) .map(item -> new WeaTableColumn("100px", item.getName(), item.getId() + SalaryConstant.DYNAMIC_SUFFIX)) .collect(Collectors.toList()); @@ -478,7 +481,7 @@ public class SalaryStatisticsEmployeeWrapper extends Service { .employeeIds(Collections.singletonList((long) user.getUID())) .build(); List salaryAcctEmployeeList = getSalaryAcctEmployeeService(user).listByParam(salaryAcctEmployeeQueryParam); - salaryAcctEmployeeList = salaryAcctEmployeeList.stream().sorted((a,b)->-a.getSalaryMonth().compareTo(b.getSalaryMonth())).collect(Collectors.toList()); + salaryAcctEmployeeList = salaryAcctEmployeeList.stream().sorted((a, b) -> -a.getSalaryMonth().compareTo(b.getSalaryMonth())).collect(Collectors.toList()); List> empParts = Lists.partition(salaryAcctEmployeeList, 500);