From a6fc40a084d203f2256f854ede068ba96cd88afc Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Tue, 16 May 2023 14:12:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=20?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=97=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salaryacct/bo/SalaryAcctResultBO.java     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
index df92e4715..97ef9afae 100644
--- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
+++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
@@ -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();