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

Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01

This commit is contained in:
Harryxzy 2023-06-07 12:27:29 +08:00
parent 466412a444 f4627b53f9
commit a6356a7d3d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java
View File

@ -155,6 +155,8 @@ public class SalaryItemBO {
.dataType(Optional.ofNullable(salaryDataTypeEnum)
.map(e -> SalaryI18nUtil.getI18nLabel(e.getLabelId(), e.getDefaultLabel()))
.orElse(StringUtils.EMPTY))
.formulaId(salaryItemPO.getFormulaId())
.formulaContent(formulaMap.getOrDefault(salaryItemPO.getFormulaId(),""))
.taxDeclarationColumn(buildTaxDeclarationColumn(salaryItemPO.getCode()))
.sortedIndex(salaryItemPO.getSortedIndex())
.description(salaryItemPO.getDescription())