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 |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
index 06c3f4e..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 &gt;= STR_TO_DATE(#{params.receiptPaymentDateStart},'yyyy-mm-dd')
+            </if>
+            <if test="params.receiptPaymentDateEnd != null and params.receiptPaymentDateEnd != '' ">
+                AND T1.receipt_payment_date &lt; STR_TO_DATE(#{params.receiptPaymentDateEnd}, '%Y-%m-%d')
+            </if>
         </where>
         ORDER BY T1.receipt_payment_date DESC
     </select>
@@ -255,4 +261,14 @@
         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