From 2b4ded9dd0ebf1b7f0f8a0954a8ba62e9b98501c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 30 Oct 2023 19:19:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E8=AE=A1=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=A0=B9=E6=8D=AE=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/SalaryAcctImportFieldDTO.java         |  3 +++
 .../impl/SalaryAcctExcelServiceImpl.java      |  3 +++
 .../impl/SalaryAcctResultServiceImpl.java     | 23 +++++++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctImportFieldDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctImportFieldDTO.java
index 67d3560e6..fe5376506 100644
--- a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctImportFieldDTO.java
+++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctImportFieldDTO.java
@@ -47,6 +47,9 @@ public class SalaryAcctImportFieldDTO {
 
         //薪资项目名称
         private String salaryItemName;
+
+        //薪资项目类型
+        private String dataType;
     }
 
     @Data
diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index 35f02da4a..e322d8fd3 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -28,6 +28,7 @@ import com.engine.salary.entity.taxagent.po.TaxAgentPO;
 import com.engine.salary.enums.UserStatusEnum;
 import com.engine.salary.enums.salaryaccounting.LockStatusEnum;
 import com.engine.salary.enums.salaryaccounting.SalaryAcctResultDataSourceEnum;
+import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.mapper.sys.SalarySysConfMapper;
 import com.engine.salary.service.*;
@@ -442,6 +443,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
                     .map(salarySobItemPO -> SalaryAcctImportFieldDTO.ImportFieldDTO.builder()
                         .salaryItemId(salarySobItemPO.getSalaryItemId())
                         .salaryItemName(Optional.ofNullable(salaryItemMap.get(salarySobItemPO.getSalaryItemId())).map(SalaryItemPO::getName).orElse(StringUtils.EMPTY))
+                        .dataType(Optional.ofNullable(salaryItemMap.get(salarySobItemPO.getSalaryItemId())).map(SalaryItemPO::getDataType).orElse(SalaryDataTypeEnum.NUMBER.getValue()))
                         .build())
                     .collect(Collectors.toList());
 
@@ -458,6 +460,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
                     .map(salarySobItemPO ->SalaryAcctImportFieldDTO.ImportFieldDTO.builder()
                             .salaryItemId(salarySobItemPO.getSalaryItemId())
                             .salaryItemName(Optional.ofNullable(salaryItemMap.get(salarySobItemPO.getSalaryItemId())).map(SalaryItemPO::getName).orElse(StringUtils.EMPTY))
+                            .dataType(Optional.ofNullable(salaryItemMap.get(salarySobItemPO.getSalaryItemId())).map(SalaryItemPO::getDataType).orElse(SalaryDataTypeEnum.NUMBER.getValue()))
                             .build())
                     .collect(Collectors.toList());
 
diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index b6b7c2d2d..979e24b3c 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -347,6 +347,29 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
 
     @Override
     public Map<String, Object> sumRow(SalaryAcctResultQueryParam queryParam) {
+
+        //其他条件
+        List<SalaryAcctResultQueryParam.OtherCondition> otherConditions = queryParam.getOtherConditions();
+        if(CollectionUtils.isNotEmpty(otherConditions)){
+            List<Long> items = SalaryEntityUtil.properties(otherConditions, SalaryAcctResultQueryParam.OtherCondition::getItemId, Collectors.toList());
+            List<SalaryAcctResultPO> list = listBySalaryAcctRecordIdsAndSalaryItemIds(Collections.singletonList(queryParam.getSalaryAcctRecordId()), items);
+            for (int i = 0; i < otherConditions.size(); i++) {
+                SalaryAcctResultQueryParam.OtherCondition otherCondition = otherConditions.get(i);
+                Long itemId = otherCondition.getItemId();
+                FilterEnum filter = otherCondition.getFilter();
+                List<String> params = otherCondition.getParams();
+                list = list.stream().filter(a -> Objects.equals(a.getSalaryItemId(), itemId)).filter(a -> filter.filter(params).test(a.getResultValue())).collect(Collectors.toList());
+            }
+            List<Long> salaryAcctEmpId = SalaryEntityUtil.properties(list, SalaryAcctResultPO::getSalaryAcctEmpId, Collectors.toList());
+            if (CollectionUtils.isEmpty(salaryAcctEmpId)) {
+                //条件不满足直接返回空列表
+                return new HashMap<>();
+            } else {
+                queryParam.setIds(salaryAcctEmpId);
+            }
+        }
+
+
         // 查询薪资核算人员
         List<SalaryAcctEmployeePO> salaryAcctEmployeePOS = getSalaryAcctEmployeeService(user).listByResultQueryParam(queryParam);