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

导入核算结果时，添加sql项

This commit is contained in:
钱涛 2022-08-15 17:16:48 +08:00
parent 20967f04ab
commit ddccbb0d78
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/engine/salary/entity/salaryacct/dto/SalaryAcctImportFieldDTO.java
View File

@ -24,6 +24,9 @@ public class SalaryAcctImportFieldDTO {
//公式项
private Collection<ImportFieldDTO> formulaItems;
//sql项
private Collection<ImportFieldDTO> sqlItems;
//输入项
private Collection<ImportFieldDTO> inputItems;

10
src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
View File

@ -311,6 +311,14 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
.salaryItemName(salaryItemPO.getName())
.build())
.collect(Collectors.toList());
// 薪资项目中的SQl项
List<SalaryAcctImportFieldDTO.ImportFieldDTO> sqlItems = salaryItems.stream()
.filter(salaryItemPO -> Objects.equals(salaryItemPO.getValueType(), SalaryValueTypeEnum.SQL.getValue()))
.map(salaryItemPO -> SalaryAcctImportFieldDTO.ImportFieldDTO.builder()
.salaryItemId(salaryItemPO.getId())
.salaryItemName(salaryItemPO.getName())
.build())
.collect(Collectors.toList());
// 薪资项目中的输入项
List<SalaryAcctImportFieldDTO.ImportFieldDTO> inputItems = salaryItems.stream()
.filter(salaryItemPO -> Objects.equals(salaryItemPO.getValueType(), SalaryValueTypeEnum.INPUT.getValue()))
@ -320,7 +328,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
.build())
.collect(Collectors.toList());
// 转换成dto
return SalaryAcctImportFieldDTO.builder().formulaItems(formulaItems).inputItems(inputItems).build();
return SalaryAcctImportFieldDTO.builder().formulaItems(formulaItems).sqlItems(sqlItems).inputItems(inputItems).build();
}
@Override