From 4644f34bbb5ac30c4f6baa9b281f6bf8e95f8575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 28 Aug 2023 16:48:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=92=8C=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E7=94=B3=E6=8A=A5=E6=B5=81=E9=87=8F=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/impl/EmployeeDeclareServiceImpl.java       | 3 +--
 .../service/impl/TaxDeclarationApiBillingServiceImpl.java     | 3 ++-
 .../salary/service/impl/TaxDeclareRecordServiceImpl.java      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
index 18813dd04..f50a2d337 100644
--- a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
+++ b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
@@ -640,7 +640,7 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla
                 + "-" + e.getOrDefault("zzlx", "")
                 + "-" + e.getOrDefault("zzhm", ""));
         // 流量使用情况
-        TaxDeclarationApiBillingServiceImpl.ApiFlowUpdateWrapper apiFlowUpdateWrapper = new TaxDeclarationApiBillingServiceImpl.ApiFlowUpdateWrapper(param.getTaxCycle(), apiConfig, EnumDeclareApiBusinessType.EMPLOYEE_DECLARATION);
+        TaxDeclarationApiBillingServiceImpl.ApiFlowUpdateWrapper apiFlowUpdateWrapper = new TaxDeclarationApiBillingServiceImpl.ApiFlowUpdateWrapper(param.getTaxCycle(), apiConfig, EnumDeclareApiBusinessType.EMPLOYEE_DECLARATION, (long) user.getUID());
         // 查询申报的人员列表
         Date now = new Date();
         List<EmployeeDeclarePO> needUpdateEmployeeDeclares = Lists.newArrayList();
@@ -689,7 +689,6 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla
 //        loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(156452, "获取结果反馈"));
 //        employeeDeclareLoggerTemplate.write(loggerContext);
         // 更新流量统计
-        //todo
         getTaxDeclarationApiBillingService(user).updateApiFlowInfo(apiFlowUpdateWrapper);
         // 报送失败的
         int declareFailSize = (int) needUpdateEmployeeDeclares.stream()
diff --git a/src/com/engine/salary/service/impl/TaxDeclarationApiBillingServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationApiBillingServiceImpl.java
index bf64c6e18..e09f4cb69 100644
--- a/src/com/engine/salary/service/impl/TaxDeclarationApiBillingServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclarationApiBillingServiceImpl.java
@@ -196,11 +196,12 @@ public class TaxDeclarationApiBillingServiceImpl extends Service implements TaxD
         //  接口类型
         private EnumDeclareApiBusinessType businessType;
 
-        public ApiFlowUpdateWrapper(Date taxYearMonth, TaxDeclarationApiConfigPO apiConfig, EnumDeclareApiBusinessType businessType) {
+        public ApiFlowUpdateWrapper(Date taxYearMonth, TaxDeclarationApiConfigPO apiConfig, EnumDeclareApiBusinessType businessType,Long currentEmployeeId) {
             this.taxYearMonth = taxYearMonth;
             this.apiFlowDetailPOList = new ArrayList<>();
             this.apiConfig = apiConfig;
             this.businessType = businessType;
+            this.currentEmployeeId = currentEmployeeId;
         }
     }
 
diff --git a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
index fb3662784..6991bdeea 100644
--- a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
@@ -550,7 +550,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
         // 删除个税申报表明细
         getTaxDeclarationValueService(user).deleteByTaxDeclareRecordIds(ids);
 
-        taxDeclareRecords.forEach(po->{
+        taxDeclareRecords.forEach(po -> {
             // 获取当前个税扣缴义务人下的薪资账套
             List<SalarySobPO> salarySobPOS = getSalarySobService(user).listByTaxAgentId(po.getTaxAgentId());
             List<Long> salarySobIds = salarySobPOS.stream().map(SalarySobPO::getId).collect(Collectors.toList());
@@ -699,7 +699,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
         List<EmployeeDeclarePO> employeeDeclares = getEmployeeDeclareService(user).listByTaxCycleAndTaxAgentId(taxDeclareRecord.getTaxCycle(), taxDeclareRecord.getTaxAgentId());
         Map<String, EmployeeDeclarePO> employeeInfoMap = SalaryEntityUtil.convert2Map(employeeDeclares, e -> e.getEmployeeName() + "-" + e.getCardNum());
         // 流量统计
-        TaxDeclarationApiBillingServiceImpl.ApiFlowUpdateWrapper apiFlowUpdateWrapper = new TaxDeclarationApiBillingServiceImpl.ApiFlowUpdateWrapper(taxDeclareRecord.getTaxCycle(), apiConfig, EnumDeclareApiBusinessType.TAX_DECLARATION);
+        TaxDeclarationApiBillingServiceImpl.ApiFlowUpdateWrapper apiFlowUpdateWrapper = new TaxDeclarationApiBillingServiceImpl.ApiFlowUpdateWrapper(taxDeclareRecord.getTaxCycle(), apiConfig, EnumDeclareApiBusinessType.TAX_DECLARATION, (long) user.getUID());
 
         Date now = new Date();
         List<String> errorMsg = Lists.newArrayList();