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

薪资核算 编辑列改造

This commit is contained in:
Harryxzy 2023-05-16 14:12:49 +08:00
parent 7c74149184
commit a6fc40a084
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -409,16 +409,16 @@ public class SalaryAcctResultBO {
.sortedIndex(groupPO.getSortedIndex()).build() );
}
// 公式项的值（不根据salaryItemPO的valueType判断是因为薪资项目的valueType属性改变后并不会同步更新薪资账套中的薪资项目的formulaId字段）
List<SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO> formulaItems = salarySobItemPOS.stream()
.filter(salarySobItemPO -> salarySobItemPO.getFormulaId() > 0)
.map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap))
.collect(Collectors.toList());
// 输入/导入项目的值
List<SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO> inputItems = salarySobItemPOS.stream()
.filter(salarySobItemPO -> salarySobItemPO.getFormulaId() <= 0)
.map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap))
.collect(Collectors.toList());
// // 公式项的值（不根据salaryItemPO的valueType判断是因为薪资项目的valueType属性改变后并不会同步更新薪资账套中的薪资项目的formulaId字段）
// List<SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO> formulaItems = salarySobItemPOS.stream()
// .filter(salarySobItemPO -> salarySobItemPO.getFormulaId() > 0)
// .map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap))
// .collect(Collectors.toList());
// // 输入/导入项目的值
// List<SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO> inputItems = salarySobItemPOS.stream()
// .filter(salarySobItemPO -> salarySobItemPO.getFormulaId() <= 0)
// .map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap))
// .collect(Collectors.toList());
// // TODO 临时处理，后续删除，将已发补发加入输入、导入
// formulaItems.addAll(salarySobBackItemPOS.stream()
// .map(salarySobBackItemPO -> backItemConvert2SalaryAcctResultDetailItemDTO(salarySobBackItemPO, salaryBackItemMap.get(salarySobBackItemPO.getSalaryItemId()), resultValueMap, salaryBackItemFormula))
@ -431,8 +431,8 @@ public class SalaryAcctResultBO {
.id(salaryAcctEmployee.getId())
.employeeId(salaryAcctEmployee.getEmployeeId())
.employeeInfos(employeeInfos)
.formulaItems(formulaItems)
.inputItems(inputItems)
// .formulaItems(formulaItems)
// .inputItems(inputItems)
.itemsByGroup(itemsByGroup)
.issuedAndReissueItems(issuedAndReissueItems)
.build();