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

修复调薪记录显示问题

This commit is contained in:
钱涛 2023-02-06 11:08:59 +08:00
parent a3775babd3
commit 0fb9fb51a0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
View File

@ -245,7 +245,11 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt
if (CollectionUtils.isNotEmpty(listAll)) {
listAll.removeIf(a -> a.getId().equals(m.getId()));
}
Optional<SalaryItemAdjustRecordListDTO> optional = listAll.stream().filter(f -> f.getSalaryArchiveId().equals(m.getSalaryArchiveId()) && f.getSalaryItemId().equals(m.getSalaryItemId())).findFirst();
Optional<SalaryItemAdjustRecordListDTO> optional = listAll.stream()
.filter(f -> f.getSalaryArchiveId().equals(m.getSalaryArchiveId()))
.filter(f ->f.getSalaryItemId().equals(m.getSalaryItemId()))
.filter(f->f.getEffectiveTime().before(m.getEffectiveTime()))
.findFirst();
m.setAdjustBefore(optional.isPresent() ? optional.get().getAdjustAfter() : "");
m.setAdjustReason(SalaryArchiveItemAdjustReasonEnum.getDefaultLabelByValue(m.getAdjustReason()));