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

合并冲突

This commit is contained in:
Harryxzy 2025-08-15 10:11:17 +08:00
parent 4f051fcf04
commit 065bea67b1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
View File

@ -285,7 +285,7 @@ public class SalaryAcctResultBO {
List<SalaryAcctResultPO> acctResult = acctResultMap.getOrDefault(e.getEmployeeId(), Collections.emptyList());
Map<Long, Object> resultValueMap = SalaryEntityUtil.convert2Map(acctResult,
SalaryAcctResultPO::getSalaryItemId, SalaryAcctResultPO::getResultValue);
Map<Long, String> resultFeedbackValueMap = SalaryEntityUtil.convert2Map(acctResult.stream().filter(result -> StringUtils.isNotBlank(result.getEkFeedback())).collect(Collectors.toList()),
Map<Long, String> resultFeedbackValueMap = SalaryEntityUtil.convert2Map(acctResult.stream().filter(r -> StringUtils.isNotBlank(r.getEkFeedback())).collect(Collectors.toList()),
SalaryAcctResultPO::getSalaryItemId, SalaryAcctResultPO::getEkFeedback);
// 薪资项目的值
Map<String, Object> map = SalaryEntityUtil.convert2Map(salaryItems, o -> "" + o.getId(), o -> resultValueMap.getOrDefault(o.getId(), StringUtils.EMPTY));