From bcf0c50525ef3964162187a8ff0d60c52693cac4 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 12 Aug 2024 14:57:30 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=9F=A5=E8=AF=A2=E5=88=B023=E5=B9=B4?=
 =?UTF-8?q?=E5=8F=8A=E4=B9=8B=E5=89=8D=E7=9A=84=E6=89=93=E5=8C=85=E5=AD=90?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/mapper/xml/PayPaymentRecordMapper.xml    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
index 6a92a389..7f06f46b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
@@ -57,7 +57,7 @@
         where
         c.receivable_amount <![CDATA[<>]]> 0
         and c.receivable_amount is not null
-        and c.pack = 0
+        and (pack = 0 or year <![CDATA[<]]> 2024)
         <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
             AND c.principal_id = #{payCommonProject.principalId}
         </if>
@@ -94,7 +94,7 @@
         where
         gsub.receivable_amount <![CDATA[<>]]> 0
         and gsub.receivable_amount is not null
-        and gsub.pack = 0
+        and (pack = 0 or year <![CDATA[<]]> 2024)
         <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
             AND g.principal_id_a = #{payCommonProject.principalId}
         </if>
@@ -130,7 +130,7 @@
         where
         sit.amount_receivable <![CDATA[<>]]> 0
         and sit.amount_receivable is not null
-        and sit.pack = 0
+        and (pack = 0 or particular_year <![CDATA[<]]> 2024)
         <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
             AND meeting.director_id = #{payCommonProject.principalId}
         </if>
@@ -166,7 +166,7 @@
         where
         msub.amount_receivable <![CDATA[<>]]> 0
         and msub.amount_receivable is not null
-        and msub.pack = 0
+        and (pack = 0 or particular_year <![CDATA[<]]> 2024)
         <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
             AND pmp.director_id = #{payCommonProject.principalId}
         </if>
@@ -206,7 +206,7 @@
         where
         tmsub.amount_receivable <![CDATA[<>]]> 0
         and tmsub.amount_receivable is not null
-        and tmsub.pack = 0
+        and (pack = 0 or year <![CDATA[<]]> 2024)
         <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
             AND tmember.director_id = #{payCommonProject.principalId}
         </if>
@@ -249,7 +249,7 @@
         where
         tcp.amount_receivable <![CDATA[<>]]> 0
         and tcp.amount_receivable is not null
-        and tcp.pack = 0
+        and (pack = 0 or year <![CDATA[<]]> 2024)
         <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
             AND tmember.director_id = #{payCommonProject.principalId}
         </if>