From 3b2da9fbba7117514c9c52ab68977977ad205e86 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 06 六月 2025 15:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/sales/ReceiptPaymentMapper.xml | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
index 8d185da..53cca98 100644
--- a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
+++ b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -29,7 +29,7 @@
AND T4.customer_id = #{receiptPaymentDto.customerId}
</if>
</where>
- ORDER BY T1.receipt_payment_date ASC
+ ORDER BY T1.create_time ASC
</select>
<select id="receiptPaymentInfo" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
@@ -138,8 +138,31 @@
T4.customer_id = #{customerId}
ORDER BY
- T1.receipt_payment_date ASC
+ T1.create_time ASC
LIMIT #{total} ) AS limited_rows
</select>
+ <select id="receiptPaymentHistoryList" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
+ SELECT
+ T1.receipt_payment_date,
+ T5.customer_name,
+ T1.receipt_payment_amount,
+ T1.receipt_payment_type,
+ T1.registrant,
+ T1.create_time
+ FROM
+ receipt_payment T1
+ LEFT JOIN
+ invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
+ LEFT JOIN invoice_registration_product T3 ON T2.invoice_registration_product_id = T3.id
+ LEFT JOIN sales_ledger T4 ON T3.sales_ledger_id = T4.id
+ LEFT JOIN customer T5 ON T5.id = T4.customer_id
+ <where>
+ <if test="params.searchText != null and params.searchText != '' ">
+ T5.customer_name LIKE CONCAT('%',#{params.searchText},'%')
+ </if>
+ </where>
+ ORDER BY T1.receipt_payment_date DESC
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3