From 5480a2d28112e400a40b1104dd223ca848ce5557 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 11 Mar 2024 17:13:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8=E5=AF=BC=E5=87=BA=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=89=93=E5=8C=85=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/PayPaymentRecordMapper.xml     | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

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 f7a80029..85e55ab5 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
@@ -550,6 +550,35 @@
         <if test="payCommonProject.affirmIncome != null">
             AND tcp.affirm_income = #{payCommonProject.affirmIncome}
         </if>
+        <!-- 打包项目-->
+        UNION ALL
+        select ppc.id,ppc.company_temporary_name AS charge_project,22 AS charge_use,ppc.pack_principal_id as principal_id,su.realname AS principal_name,ppc.company_id as charge_company_id,ppc.company_temporary_name as charge_company_temporary_name,ppc.receivable_amount,ppc.paid_amount,
+        ppc.need_invoice,NULL AS pack,ppc.in_account,ppc.make_invoice,NULL AS mail,ppc.create_time,8 AS projectType,ppc.invoice_amount,ppc.mail_contacts_id,'' AS register_check_result,ppc.pack_contact_temporary_name as contacts_temporary_name,NULL AS payment_status,ppc.company_temporary_id,ppc.confirm_amount,ppc.income_affirm AS affirm_income
+        from pay_pack_company ppc
+        left join sys_user su on ppc.pack_principal_id = su.id
+        left join pay_company_management on ppc.company_id = pay_company_management.id
+        where
+        ppc.receivable_amount <![CDATA[<>]]> 0
+        and ppc.receivable_amount is not null
+        <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
+            AND ppc.pack_principal_id = #{payCommonProject.principalId}
+        </if>
+        <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
+            AND ppc.company_temporary_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
+        </if>
+        <!-- 来款未开票 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
+            AND (ppc.paid_amount <![CDATA[>]]> ppc.invoice_amount or
+            (ppc.paid_amount is not null and ppc.paid_amount !=0 and ppc.invoice_amount is null))
+        </if>
+        <!-- 开票未来款 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
+            AND (ppc.paid_amount <![CDATA[<]]> ppc.invoice_amount or
+            (ppc.paid_amount is null and ppc.invoice_amount is not null and ppc.invoice_amount !=0))
+        </if>
+        <if test="payCommonProject.affirmIncome != null">
+            AND ppc.income_affirm = #{payCommonProject.affirmIncome}
+        </if>
         )p
         LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id
         <where>