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

港湾报表bug

This commit is contained in:
Harryxzy 2025-03-05 17:04:10 +08:00
parent c87b561b7a
commit 5ef5921a6a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
View File

@ -2261,6 +2261,9 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
// 获取薪资核算人员
List<Long> salaryAcctRecordIds = salaryAcctRecordList.stream().map(SalaryAcctRecordPO::getId).collect(Collectors.toList());
List<SalaryAcctEmployeePO> salaryAcctEmployeeList = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordIds(salaryAcctRecordIds);
if (CollectionUtils.isEmpty(salaryAcctRecordIds)) {
salaryAcctEmployeeList = new ArrayList<>();
}
List<Long> salaryAcctEmpIds = salaryAcctEmployeeList.stream().map(SalaryAcctEmployeePO::getId).collect(Collectors.toList());
List<DataCollectionEmployee> employeeList = getSalaryEmployeeService(user).listByIds(salaryAcctEmployeeList.stream().map(SalaryAcctEmployeePO::getEmployeeId).collect(Collectors.toList()));
// 获取薪资核算数据
@ -2273,7 +2276,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
List<Map<String, Object>> acctResultMap = SalaryAcctResultBO.buildData4Shgw(salaryItemPOList, Collections.emptyList(), employeeList, salaryAcctEmployeeList, acctResultList, taxAgentList, user);
// 根据部门和部门编号分组
Map<String, List<Map<String, Object>>> acctResultGroupMap = SalaryEntityUtil.group2Map(acctResultMap, result -> result.getOrDefault("taxAgentName", "") + "_split" + resultMap.getOrDefault(fylxSalaryItemId, ""));
Map<String, List<Map<String, Object>>> acctResultGroupMap = SalaryEntityUtil.group2Map(acctResultMap, result -> result.getOrDefault("taxAgentName", "") + "_split" + result.getOrDefault(fylxSalaryItemId.toString(), ""));
List<SalaryItemPO> numberItems = salaryItemPOList.stream().filter(item -> item.getDataType().equals(SalaryDataTypeEnum.NUMBER.getValue())).collect(Collectors.toList());
LinkedHashMap<String, Map<String, Object>> sumResultByGroup = getSumResultByGroup(acctResultGroupMap, Collections.emptyList(), numberItems, gwReportConfigList, ufHwxcbbpzList, taxAgentPO, SalaryDateUtil.dateStrToLocalYearMonth(param.getStartMonthStr()));