From 22f494fe120376f975c8b46c78d463889e08db98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 24 Apr 2025 16:02:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=89=E7=85=A7=E6=89=A3?=
 =?UTF-8?q?=E7=BC=B4=E4=B9=89=E5=8A=A1=E4=BA=BA=E5=90=8D=E7=A7=B0=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/TaxDeclarationListQueryParam.java           |  9 +++++++++
 .../service/impl/TaxDeclarationServiceImpl.java       | 11 +++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java b/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java
index 79b4ac79a..a7de714a9 100644
--- a/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java
+++ b/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java
@@ -1,11 +1,13 @@
 package com.engine.salary.entity.taxdeclaration.param;
 
 import com.engine.salary.common.BaseQueryParam;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+
 import java.util.Date;
 
 /**
@@ -22,7 +24,14 @@ import java.util.Date;
 @AllArgsConstructor
 public class TaxDeclarationListQueryParam extends BaseQueryParam {
 
+    //薪资所属月范围起点
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date fromSalaryMonth;
 
+    //薪资所属月范围终点
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endSalaryMonth;
+
+    //个税扣缴义务人菜单")
+    private String taxAgentName;
 }
diff --git a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
index e47049045..afe5a6991 100644
--- a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
@@ -1,5 +1,6 @@
 package com.engine.salary.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.hrmelog.entity.dto.LoggerContext;
@@ -9,6 +10,7 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
 import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
 import com.engine.salary.entity.salarysob.po.SalarySobPO;
+import com.engine.salary.entity.taxagent.param.TaxAgentQueryParam;
 import com.engine.salary.entity.taxagent.po.TaxAgentPO;
 import com.engine.salary.entity.taxdeclaration.bo.TaxDeclarationBO;
 import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationListQueryParam;
@@ -135,6 +137,15 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
 
         // 查询个税申报表
         List<TaxDeclarationPO> taxDeclarationPOS = getTaxDeclarationMapper().listSome(po);
+
+
+        if (StrUtil.isNotBlank(queryParam.getTaxAgentName())) {
+            List<TaxAgentPO> taxAgentPOs = getTaxAgentService(user).list(TaxAgentQueryParam.builder().name(queryParam.getTaxAgentName()).build());
+            Set<Long> taxAgentIds = SalaryEntityUtil.properties(taxAgentPOs, TaxAgentPO::getId);
+            taxDeclarationPOS = taxDeclarationPOS.stream().filter(tax -> taxAgentIds.contains(tax.getTaxAgentId())).collect(Collectors.toList());
+        }
+
+
         return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
                 taxDeclarationPOS, TaxDeclarationPO.class);