From ed0f5aafb57137002c9b88dcef396ec5ee7f3a04 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 九月 2025 13:39:40 +0800
Subject: [PATCH] yys 1.回款登记台账页面，增加一个开票日期列 2.销售台账，在合同金额后面，增加已开票金额、待开票金额、已回款金额、待回款金额
---
src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index 26a405b..59396c5 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -149,4 +149,38 @@
</select>
+ <select id="paymentHistoryListPage" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
+ SELECT
+ T1.id,
+ T1.payment_date,
+ T2.supplier_name,
+ T1.current_payment_amount,
+ T1.payment_method,
+ T3.nick_name AS registrant,
+ T1.registrationt_date,
+ t4.purchase_contract_number,
+ t5.invoice_amount,
+ t5.invoice_number
+ FROM
+ payment_registration T1
+ LEFT JOIN purchase_ledger t4 ON t4.id = T1.purchase_ledger_id
+ LEFT JOIN
+ supplier_manage T2 ON T1.supplier_id = T2.id
+ LEFT JOIN
+ sys_user T3 ON T3.user_id = T1.registrant_id
+ left join ticket_registration t5 on t5.purchase_ledger_id = T1.purchase_ledger_id
+ <where>
+ <if test="params.searchText != null and params.searchText != '' ">
+ AND T2.supplier_name LIKE CONCAT('%',#{params.searchText},'%')
+ </if>
+ <if test="params.paymentDateStart != null and params.paymentDateStart !='' ">
+ AND T1.payment_date >= date_format(#{params.paymentDateStart},'%Y-%m-%d')
+ </if>
+ <if test="params.paymentDateEnd != null and params.paymentDateEnd !='' ">
+ AND T1.payment_date <= date_format(#{params.paymentDateEnd},'%Y-%m-%d')
+ </if>
+ </where>
+ ORDER BY T1.payment_date,T1.create_time DESC
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3