From ddccbb0d78f75006dc434495c801c2e8e7663303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 15 Aug 2022 17:16:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A0=B8=E7=AE=97=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E6=97=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0sql=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salaryacct/dto/SalaryAcctImportFieldDTO.java | 3 +++ .../service/impl/SalaryAcctExcelServiceImpl.java | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctImportFieldDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctImportFieldDTO.java index 37b71dd32..b51422d68 100644 --- a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctImportFieldDTO.java +++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctImportFieldDTO.java @@ -24,6 +24,9 @@ public class SalaryAcctImportFieldDTO { //公式项 private Collection formulaItems; + //sql项 + private Collection sqlItems; + //输入项 private Collection inputItems; diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index e800229a9..a381436c0 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -311,6 +311,14 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc .salaryItemName(salaryItemPO.getName()) .build()) .collect(Collectors.toList()); + // 薪资项目中的SQl项 + List 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 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