Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01

报表穿透，按照薪资所属月排序
2025-12-02 10:22:35 +08:00 · 2025-12-02 10:22:14 +08:00
1 changed files with 1 additions and 1 deletions
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
@ -525,7 +525,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
            throw new SalaryRunTimeException("该维度值中无数据！");
        }
        // 同一个人放在一起
-        listByDimensionValue = listByDimensionValue.stream().sorted(Comparator.comparing(SalaryAcctEmployeePO::getEmployeeId)).collect(Collectors.toList());
+        listByDimensionValue = listByDimensionValue.stream().sorted((a,b)-> b.getSalaryMonth().compareTo(a.getSalaryMonth())).collect(Collectors.toList());
        List<SalaryAcctEmployeePO> salaryAcctEmployeePOList = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), listByDimensionValue);

        // 获取此分页的核算人员
Author	SHA1	Message	Date
钱涛	cf68e118fa	Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01	2025-12-02 10:22:35 +08:00
钱涛	cb423962a2	报表穿透，按照薪资所属月排序	2025-12-02 10:22:14 +08:00