From cdc16c48e3130408d3689afc134ee312c35347b8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 02 七月 2025 16:25:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/sales/InvoiceLedgerMapper.xml | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml b/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
index 7bc19bd..b8f9aa2 100644
--- a/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
@@ -113,8 +113,8 @@
SELECT
T4.id,T4.customer_name ,
SUM(invoice_total) AS invoice_total,
- IFNULL( T5.receipt_payment_amount , 0 ) AS receipt_payment_amount,
- (invoice_total - receipt_payment_amount) AS unReceipt_payment_amount
+ IFNULL( SUM(T5.receipt_payment_amount) , 0 ) AS receipt_payment_amount,
+ IFNULL((SUM(invoice_total) - SUM(T5.receipt_payment_amount)),0) AS unReceipt_payment_amount
FROM
invoice_ledger T1
LEFT JOIN invoice_registration_product T2 ON T1.invoice_registration_product_id = T2.id
@@ -167,5 +167,22 @@
WHERE T1.id = #{id}
</select>
+ <select id="invoicedTotal" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
+ SELECT
+ IFNULL(SUM(T1.invoice_total),0) AS invoice_total,
+ T2.sales_ledger_id
+ FROM
+ invoice_ledger T1
+ LEFT JOIN invoice_registration_product T2 ON T1.invoice_registration_product_id = T2.id
+ <where>
+ AND T2.sales_ledger_id IN
+ <foreach collection="salesLedgerIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </where>
+ GROUP BY
+ T2.sales_ledger_id
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3