From 84344f16a7f783cd32731764010a75a0af268384 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 08 四月 2026 11:32:37 +0800
Subject: [PATCH] feat:同步烜曌工贸（gongchunyi-26/4/3）
---
src/main/resources/mapper/sales/InvoiceLedgerMapper.xml | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml b/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
index 11d1538..150f817 100644
--- a/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
@@ -111,15 +111,20 @@
<select id="invoiceLedgerSalesAccount" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
SELECT
- customer_id,
- T2.customer_name,
- SUM( invoice_amount ) invoiceAmount
- FROM
- invoice_ledger T1
- LEFT JOIN customer T2 ON T1.customer_id = T2.id
- GROUP BY
- customer_id,
- T2.customer_name;
+ c.id AS id,
+ c.customer_name,
+ IFNULL(SUM(T1.contract_amount), 0) AS invoice_total,
+ IFNULL(SUM(T2.receipt_payment_amount), 0) AS receipt_payment_amount,
+ IFNULL(SUM(T1.contract_amount), 0) - IFNULL(SUM(T2.receipt_payment_amount), 0) AS unReceipt_payment_amount
+ FROM customer c
+ LEFT JOIN sales_ledger T1 ON c.id = T1.customer_id
+ LEFT JOIN receipt_payment T2 ON T1.id = T2.sales_ledger_id
+ <where>
+ <if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != '' ">
+ c.customer_name LIKE CONCAT ('%',#{invoiceLedgerDto.searchText},'%')
+ </if>
+ </where>
+ GROUP BY c.id, c.customer_name
</select>
<select id="invoiceLedgerProductInfo" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">
@@ -160,5 +165,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