From 74bb4beffc55a4e8e5f1835b460c889193576fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 5 Feb 2025 16:00:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=9A=E5=8A=A1=E7=BA=BF?=
 =?UTF-8?q?=E6=A0=B8=E7=AE=97=E4=B8=8D=E4=BA=86=E7=A4=BE=E4=BF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/salaryacct/bo/CalculateFormulaVarBO.java  | 12 ++++++------
 .../salary/service/impl/SIAccountServiceImpl.java    |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java b/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java
index 7a10e019b..f14966bc5 100644
--- a/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java
+++ b/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java
@@ -221,7 +221,7 @@ public class CalculateFormulaVarBO {
             formulaVarValues.addAll(salaryAcctCalculateBO.getIssuedFieldIds().stream()
                     .map(fieldId -> {
                         String originResultValue = salaryAcctResultPOMap.getOrDefault(
-                                salaryCodeItemMap.get(fieldId),SalaryAcctResultPO.builder().originResultValue("").build())
+                                        salaryCodeItemMap.get(fieldId), SalaryAcctResultPO.builder().originResultValue("").build())
                                 .getOriginResultValue();
                         String fieldId2 = SalaryFormulaReferenceEnum.ISSUED.getValue()
                                 + SalaryFormulaFieldConstant.FIELD_ID_SEPARATOR
@@ -474,9 +474,9 @@ public class CalculateFormulaVarBO {
         // 社保福利可选字段
         List<String> fieldNames = Lists.newArrayList(salaryAcctCalculateBO.getWelfareColumns().values());
         // 社保福利数据
-        Map<String, List<FormulaVarValue>> tempMap = Maps.newHashMapWithExpectedSize(welfareData.size());
+        Map<String, List<FormulaVarValue>> tempMap = new HashMap<>();
         welfareData.forEach(map -> {
-            String key = String.valueOf(map.getOrDefault("employeeId", StringUtils.EMPTY));
+            String key = map.getOrDefault("employeeId", StringUtils.EMPTY) + "_" + map.getOrDefault("taxAgentId", StringUtils.EMPTY);
             List<FormulaVarValue> formulaVarValues = tempMap.computeIfAbsent(key, k -> Lists.newArrayList());
             formulaVarValues.addAll(fieldNames.stream().map(fieldName -> {
                 String fieldId = SalaryFormulaReferenceEnum.WELFARE.getValue()
@@ -489,7 +489,7 @@ public class CalculateFormulaVarBO {
         for (SalaryAcctEmployeePO salaryAcctEmployeePO : salaryAcctCalculateBO.getSalaryAcctEmployeePOS()) {
             List<FormulaVarValue> formulaVarValues = resultMap.computeIfAbsent(salaryAcctEmployeePO.getEmployeeId() + "_" + salaryAcctEmployeePO.getTaxAgentId(),
                     k -> Lists.newArrayList());
-            formulaVarValues.addAll(tempMap.getOrDefault(String.valueOf(salaryAcctEmployeePO.getEmployeeId()), Collections.emptyList()));
+            formulaVarValues.addAll(tempMap.getOrDefault(salaryAcctEmployeePO.getEmployeeId() + "_" + salaryAcctEmployeePO.getTaxAgentId(), Collections.emptyList()));
         }
     }
 
@@ -586,8 +586,8 @@ public class CalculateFormulaVarBO {
         // 填充到返回结果集中
         employeeMap.forEach((key, po) -> {
             // 获取po的状态
-            if(po.getStatus() != null && NumberUtil.isNumber(po.getStatus())) {
-                po.setStatusName(UserStatusEnum.getDefaultLabelByValue(new Integer(Util.null2s(po.getStatus(),"1"))));
+            if (po.getStatus() != null && NumberUtil.isNumber(po.getStatus())) {
+                po.setStatusName(UserStatusEnum.getDefaultLabelByValue(new Integer(Util.null2s(po.getStatus(), "1"))));
             }
             List<FormulaVarValue> formulaVarValues = resultMap.computeIfAbsent(key, k -> Lists.newArrayList());
             Map<String, String> map = JsonUtil.parseMap(po, String.class);
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 62230e2f0..79e068ae7 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -961,6 +961,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         list.stream().forEach(item -> {
             Map<String, Object> record = new HashMap<>();
             record.put("employeeId", item.getEmployeeId());
+            record.put("taxAgentId", taxAgentId);
             if (StringUtils.isNotEmpty(item.getSocialPerJson())) {
                 Map<String, Object> socialJson = JSON.parseObject(item.getSocialPerJson(), new HashMap<String, Object>().getClass());
                 socialJson.forEach((k, v) -> {