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

社保档案顺序

This commit is contained in:
钱涛 2025-11-26 17:39:05 +08:00
parent 31e5ce9d72
commit d4bc0b1c8a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
View File

@ -414,7 +414,7 @@ public class SalaryStatisticsEmployeeWrapper extends Service {
.employeeIds(Collections.singletonList((long) user.getUID())) .employeeIds(Collections.singletonList((long) user.getUID()))
.build(); .build();
List<SalaryAcctEmployeePO> salaryAcctEmployeeList = getSalaryAcctEmployeeService(user).listByParam(salaryAcctEmployeeQueryParam); List<SalaryAcctEmployeePO> 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); SalaryStatisticsEmployeeDetailResultDTO salaryStatisticsEmployeeDetailResult = getSalaryStatisticsEmployeeService(user).getDetailSalaryAcctResultByAcctEmp(salaryAcctEmployeeList);
@ -431,8 +431,11 @@ public class SalaryStatisticsEmployeeWrapper extends Service {
String salaryItemIds = new BaseBean().getPropValue("xbxtSalaryReport", "salaryItemIds"); String salaryItemIds = new BaseBean().getPropValue("xbxtSalaryReport", "salaryItemIds");
List<Long> ids = Arrays.stream(salaryItemIds.split(",")).map(Long::valueOf).collect(Collectors.toList()); List<Long> ids = Arrays.stream(salaryItemIds.split(",")).map(Long::valueOf).collect(Collectors.toList());
List<SalaryItemPO> salaryItemList = getSalaryItemService(user).listByIds(ids); List<SalaryItemPO> salaryItemList = getSalaryItemService(user).listByIds(ids);
List<WeaTableColumn> salaryItemCols = salaryItemList Map<Long, SalaryItemPO> longSalaryItemPOMap = SalaryEntityUtil.convert2Map(salaryItemList, SalaryItemPO::getId);
List<WeaTableColumn> salaryItemCols = ids
.stream() .stream()
.map(longSalaryItemPOMap::get)
.filter(Objects::nonNull)
.map(item -> new WeaTableColumn("100px", item.getName(), item.getId() + SalaryConstant.DYNAMIC_SUFFIX)) .map(item -> new WeaTableColumn("100px", item.getName(), item.getId() + SalaryConstant.DYNAMIC_SUFFIX))
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -478,7 +481,7 @@ public class SalaryStatisticsEmployeeWrapper extends Service {
.employeeIds(Collections.singletonList((long) user.getUID())) .employeeIds(Collections.singletonList((long) user.getUID()))
.build(); .build();
List<SalaryAcctEmployeePO> salaryAcctEmployeeList = getSalaryAcctEmployeeService(user).listByParam(salaryAcctEmployeeQueryParam); List<SalaryAcctEmployeePO> 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<List<SalaryAcctEmployeePO>> empParts = Lists.partition(salaryAcctEmployeeList, 500); List<List<SalaryAcctEmployeePO>> empParts = Lists.partition(salaryAcctEmployeeList, 500);