From f26d96d56ef48b41c7b2ab63794ed693e7277aad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 12 Feb 2025 14:16:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/service/AddUpDeductionService.java    | 2 --
 .../salary/service/impl/AddUpDeductionServiceImpl.java      | 6 ++----
 .../salary/service/impl/EmployeeDeclareServiceImpl.java     | 2 +-
 .../salary/service/impl/SalarySobInitServiceImpl.java       | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/com/engine/salary/service/AddUpDeductionService.java b/src/com/engine/salary/service/AddUpDeductionService.java
index 786cfe4f3..dbad058c4 100644
--- a/src/com/engine/salary/service/AddUpDeductionService.java
+++ b/src/com/engine/salary/service/AddUpDeductionService.java
@@ -186,7 +186,5 @@ public interface AddUpDeductionService {
      */
     XSSFWorkbook exportOnlineFeedbackFail(Long requestId);
 
-    String autoAddAll(Date yearMonth, boolean isAdmin, List<Long> taxAgentIds);
-
     List<AddUpDeductionDTO> listAuth(AddUpDeductionQueryParam param);
 }
diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
index 784ccc032..9a3a7ce4a 100644
--- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
@@ -35,8 +35,6 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
 import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO;
 import com.engine.salary.entity.salarysob.po.SalarySobPO;
-import com.engine.salary.entity.taxagent.bo.TaxAgentBO;
-import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeDTO;
 import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO;
 import com.engine.salary.entity.taxagent.param.TaxAgentQueryParam;
 import com.engine.salary.entity.taxagent.po.TaxAgentPO;
@@ -52,8 +50,8 @@ import com.engine.salary.enums.datacollection.EnumAddUpDeductionRequestStatus;
 import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum;
 import com.engine.salary.enums.employeedeclare.DeclareStatusEnum;
 import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum;
-import com.engine.salary.enums.salarysob.IncomeCategoryEnum;
 import com.engine.salary.enums.salaryarchive.SalaryArchiveStatusEnum;
+import com.engine.salary.enums.salarysob.IncomeCategoryEnum;
 import com.engine.salary.enums.sicategory.DeleteTypeEnum;
 import com.engine.salary.enums.taxagent.TaxAgentTaxReturnStatusEnum;
 import com.engine.salary.enums.taxdeclaration.EnumDeclareApiBusinessType;
@@ -771,7 +769,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
     }
 
     @Override
-    public String autoAddAll(Date yearMonth, boolean isAdmin, List<Long> taxAgentIds) {
+    public String autoAddAll(Date yearMonth, Boolean isAdmin, List<Long> taxAgentIds) {
         String cacheKey = "addUpDeduction_autoAddAll_processing";
         Object objVal = Util_DataCache.getObjVal(cacheKey);
         if (objVal != null) {
diff --git a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
index 643d210ca..db1fff594 100644
--- a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
+++ b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
@@ -495,7 +495,7 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla
         }
         // 查询薪资档案的发薪人员
         LocalDateRange salaryCycleRange = LocalDateRange.builder().fromDate(salaryCycle).endDate(SalaryDateUtil.localDateToDate(SalaryDateUtil.localDate2YearMonth(salaryCycle).atEndOfMonth())).build();
-        List<SalaryArchiveDataDTO> salaryArchiveDataDTOS = getSalaryArchiveService(user).getSalaryArchiveTaxAgentData(salaryCycleRange, Collections.emptyList(), refreshParam.getTaxAgentId());
+        List<SalaryArchiveDataDTO> salaryArchiveDataDTOS = getSalaryArchiveService(user).getSalaryArchiveTaxAgentData(salaryCycleRange, Collections.emptyList(), Collections.singletonList(refreshParam.getTaxAgentId()));
         List<Long> employeeIds = salaryArchiveDataDTOS.stream().map(SalaryArchiveDataDTO::getEmployeeId).collect(Collectors.toList());
         List<SalaryArchivePO> salaryArchivePOS = getSalaryArchiveService(user).listSome(SalaryArchivePO.builder().taxAgentId(refreshParam.getTaxAgentId()).employeeIds(employeeIds).build());
 
diff --git a/src/com/engine/salary/service/impl/SalarySobInitServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobInitServiceImpl.java
index a8aaf7787..2dc977dee 100644
--- a/src/com/engine/salary/service/impl/SalarySobInitServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySobInitServiceImpl.java
@@ -106,7 +106,7 @@ public class SalarySobInitServiceImpl extends AbstractSalarySobInitService {
         Date now = new Date();
         SalarySobPO salarySob = new SalarySobPO()
 //                .setId(saveParam.getId())
-                .setTaxAgentId(saveParam.getTaxAgentId())
+                .setTaxAgentId(saveParam.getTaxAgentIds().get(0))
                 .setName(saveParam.getName())
                 .setIncomeCategory(saveParam.getTaxableItems())
                 .setSalaryCycleType(saveParam.getSalaryCycleType())