From 37b697351e8e0a9200eee1276c4081c07588dc10 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 17 六月 2025 20:39:48 +0800
Subject: [PATCH] 未回款金额(元)为NaN修复
---
src/main/resources/mapper/sales/ReceiptPaymentMapper.xml | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
index 4ca0202..a73f338 100644
--- a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
+++ b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -184,6 +184,12 @@
<if test="params.searchText != null and params.searchText != '' ">
T5.customer_name LIKE CONCAT('%',#{params.searchText},'%')
</if>
+ <if test="params.receiptPaymentDateStart != null and params.receiptPaymentDateStart != '' ">
+ AND T1.receipt_payment_date >= STR_TO_DATE(#{params.receiptPaymentDateStart},'yyyy-mm-dd')
+ </if>
+ <if test="params.receiptPaymentDateEnd != null and params.receiptPaymentDateEnd != '' ">
+ AND T1.receipt_payment_date < STR_TO_DATE(#{params.receiptPaymentDateEnd}, '%Y-%m-%d')
+ </if>
</where>
ORDER BY T1.receipt_payment_date DESC
</select>
@@ -235,4 +241,34 @@
T1.happenTime ASC
</select>
+ <select id="receiptPaymentHistoryListNoPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
+ SELECT
+ T1.id,
+ 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 T1.invoice_ledger_id = #{params.invoiceLedgerId}
+ ORDER BY T1.receipt_payment_date DESC
+ </select>
+
+ <select id="receiptPaymentListByProdRegId" resultType="com.ruoyi.sales.pojo.ReceiptPayment">
+ SELECT
+ T1.*
+ FROM
+ receipt_payment T1
+ LEFT JOIN invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
+ WHERE
+ T2.invoice_registration_product_id = #{invoiceRegistrationProductId}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3