From 4d1bd63eada739fdef9a05839c90a7b564fa2dab Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 08 四月 2026 11:03:25 +0800
Subject: [PATCH] feat:发货和销售数量查询

---
 src/main/resources/mapper/sales/InvoiceLedgerMapper.xml |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml b/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
index 1e96ba0..150f817 100644
--- a/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
@@ -111,19 +111,20 @@
 
     <select id="invoiceLedgerSalesAccount" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
         SELECT
-        T1.customer_id AS id,
-        T1.customer_name,
-        SUM(contract_amount) AS invoice_total,
+        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(contract_amount), 0) - IFNULL(SUM(T2.receipt_payment_amount), 0) AS unReceipt_payment_amount
-        FROM sales_ledger T1
+        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 != '' ">
-                T1.customer_name LIKE CONCAT ('%',#{invoiceLedgerDto.searchText},'%')
+                c.customer_name LIKE CONCAT ('%',#{invoiceLedgerDto.searchText},'%')
             </if>
         </where>
-        GROUP BY T1.customer_id, T1.customer_name
+        GROUP BY c.id, c.customer_name
     </select>
 
     <select id="invoiceLedgerProductInfo" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">

--
Gitblit v1.9.3