From 3dd1c44459d77a4c170e198de2b15241eb0ef158 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Sun, 4 Feb 2024 10:55:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E6=97=B6=E6=A0=B8=E7=AE=97?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8Cbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/taxdeclaration/po/TaxDeclarationPO.java     | 10 +++++++++-
 .../mapper/taxdeclaration/TaxDeclarationMapper.xml     |  6 ++++++
 .../salary/service/impl/TaxDeclarationServiceImpl.java |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java b/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
index 682f1a87b..101b6dd52 100644
--- a/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
+++ b/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
@@ -94,10 +94,18 @@ public class TaxDeclarationPO {
      */
     private Integer controlView;
 
-    //税款所属期
+    /**
+     * 薪资所属月
+     */
     LocalDateRange salaryMonths;
 
 
+    /**
+     * 税款所属期
+     */
+    LocalDateRange taxMonths;
+
+
 
     private Collection<Long> taxAgentIds;
 }
diff --git a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
index 8324daf64..3b84589f3 100644
--- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
+++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
@@ -63,6 +63,12 @@
         <if test="salaryMonths != null and salaryMonths.endDate != null">
             AND salary_month <![CDATA[ <= ]]> #{salaryMonths.endDate}
         </if>
+        <if test="taxMonths != null and taxMonths.fromDate != null">
+            AND tax_cycle <![CDATA[ >= ]]> #{taxMonths.fromDate}
+        </if>
+        <if test="taxMonths != null and taxMonths.endDate != null">
+            AND tax_cycle <![CDATA[ <= ]]> #{taxMonths.endDate}
+        </if>
         <if test="taxAgentIds != null and taxAgentIds.size()>0">
             AND tax_agent_id IN
             <foreach collection="taxAgentIds" open="(" item="id" separator="," close=")">
diff --git a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
index 34019ce42..9ba7b8237 100644
--- a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
@@ -400,7 +400,7 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
     @Override
     public List<TaxDeclarationPO> listByTaxCycleRange(YearMonthRange yearMonthRange) {
         return getTaxDeclarationMapper().listSome(TaxDeclarationPO.builder()
-                .salaryMonths(LocalDateRange.builder().fromDate(yearMonthRange.getStartMonth()).endDate(yearMonthRange.getEndMonth()).build())
+                .taxMonths(LocalDateRange.builder().fromDate(yearMonthRange.getStartMonth()).endDate(yearMonthRange.getEndMonth()).build())
                 .build());
     }