From ccc9d4533bc7b696f6d539720a6052abc44ff7a5 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期日, 11 十月 2026 23:46:17 +0800
Subject: [PATCH] fix: 添加设备名称字段并修复多个查询的排序和分组问题
---
src/main/resources/mapper/sales/InvoiceLedgerMapper.xml | 94 ++++++++++++++++++++++++++++++++--------------
1 files changed, 65 insertions(+), 29 deletions(-)
diff --git a/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml b/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
index 11d1538..acda784 100644
--- a/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
@@ -6,12 +6,12 @@
<select id="invoiceLedgerPage" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
SELECT
T1.id ,
- T1.sales_ledger_id ,
- T1.sales_contract_no ,
- T1.customer_id ,
+ T5.sales_ledger_id AS sales_ledger_id,
+ T3.sales_contract_no AS sales_contract_no,
+ T3.customer_id AS customer_id,
T1.invoice_no ,
- T1.invoice_amount ,
- T1.tax_rate ,
+ T1.invoice_total AS invoice_amount,
+ T5.tax_rate AS tax_rate,
T1.invoice_person ,
T1.invoice_date ,
T1.create_time ,
@@ -24,8 +24,12 @@
T3.salesman,
T4.invoiceFileName
FROM invoice_ledger T1
- LEFT JOIN customer T2 ON T1.customer_id = T2.id
- LEFT JOIN sales_ledger T3 ON T1.sales_ledger_id = T3.id
+ <!-- 2026-10-12 淇锛歩nvoice_ledger 琛ㄩ噷娌℃湁 sales_ledger_id / sales_contract_no / customer_id /
+ invoice_amount / tax_rate 杩� 5 鍒楋紙瀹冧滑鍦� invoice_registration_product 涓婏級锛�
+ 鍘熸潵鐨� T1.xxx 蹇呯劧鎶� ER_BAD_FIELD_ERROR銆傛敼涓烘寜鐪熷疄缁撴瀯鍏宠仈銆� -->
+ LEFT JOIN invoice_registration_product T5 ON T5.id = T1.invoice_registration_product_id
+ LEFT JOIN sales_ledger T3 ON T3.id = T5.sales_ledger_id
+ LEFT JOIN customer T2 ON T2.id = T3.customer_id
LEFT JOIN (
SELECT
invoice_ledger_id,
@@ -48,12 +52,12 @@
<select id="invoiceLedgerList" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
SELECT
T1.id ,
- T1.sales_ledger_id ,
- T1.sales_contract_no ,
- T1.customer_id ,
+ T5.sales_ledger_id AS sales_ledger_id,
+ T3.sales_contract_no AS sales_contract_no,
+ T3.customer_id AS customer_id,
T1.invoice_no ,
- T1.invoice_amount ,
- T1.tax_rate ,
+ T1.invoice_total AS invoice_amount,
+ T5.tax_rate AS tax_rate,
T1.invoice_person ,
T1.invoice_date ,
T1.create_time ,
@@ -66,8 +70,10 @@
T3.customer_contract_no,
T4.invoiceFileName
FROM invoice_ledger T1
- LEFT JOIN customer T2 ON T1.customer_id = T2.id
- LEFT JOIN sales_ledger T3 ON T1.sales_ledger_id = T3.id
+ <!-- 2026-10-12 淇锛氬悓 invoiceLedgerPage锛屾敼涓烘寜鐪熷疄琛ㄧ粨鏋勫叧鑱� -->
+ LEFT JOIN invoice_registration_product T5 ON T5.id = T1.invoice_registration_product_id
+ LEFT JOIN sales_ledger T3 ON T3.id = T5.sales_ledger_id
+ LEFT JOIN customer T2 ON T2.id = T3.customer_id
LEFT JOIN (
SELECT
invoice_ledger_id,
@@ -90,12 +96,12 @@
<select id="invoiceLedgerInfo" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
SELECT
T1.id ,
- T1.sales_ledger_id ,
- T1.sales_contract_no ,
- T1.customer_id ,
+ T5.sales_ledger_id AS sales_ledger_id,
+ T3.sales_contract_no AS sales_contract_no,
+ T3.customer_id AS customer_id,
T1.invoice_no ,
- T1.invoice_amount ,
- T1.tax_rate ,
+ T1.invoice_total AS invoice_amount,
+ T5.tax_rate AS tax_rate,
T1.invoice_person ,
T1.invoice_date ,
T1.create_time ,
@@ -105,21 +111,34 @@
T1.tenant_id ,
T2.customer_name
FROM invoice_ledger T1
- LEFT JOIN customer T2 ON T1.customer_id = T2.id
+ <!-- 2026-10-12 淇锛氬悓 invoiceLedgerPage锛屾敼涓烘寜鐪熷疄琛ㄧ粨鏋勫叧鑱� -->
+ LEFT JOIN invoice_registration_product T5 ON T5.id = T1.invoice_registration_product_id
+ LEFT JOIN sales_ledger T3 ON T3.id = T5.sales_ledger_id
+ LEFT JOIN customer T2 ON T2.id = T3.customer_id
WHERE T1.id = #{id}
</select>
<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;
+ T1.customer_id as id,
+ T1.customer_name,
+ IFNULL(SUM(T1.contract_amount), 0) AS invoice_total,
+ IFNULL(SUM(T2.paid), 0) AS receipt_payment_amount,
+ IFNULL(SUM(T1.contract_amount), 0) - IFNULL(SUM(T2.paid), 0) AS unReceipt_payment_amount
+ FROM sales_ledger T1
+ <!-- 2026-10-13 淇锛氬師鏉ョ洿鎺� LEFT JOIN receipt_payment 鍐� SUM(contract_amount)锛�
+ 涓�绗斿彴璐︽湁鍑犵瑪鍥炴锛屽悎鍚岄灏辫閲嶅绱姞鍑犳锛堝鎴峰線鏉ラ〉鐨勩�屽悎鍚岄噾棰�/搴旀敹閲戦銆嶅洜姝よ櫄楂橈紝
+ 渚嬪瀹㈡埛 1108 瀹為檯鍚堝悓 15.37 涓囪绠楁垚 78.35 涓囷級銆傛敼鎴愬厛鎸夊彴璐︽眹鎬诲洖娆惧啀 JOIN銆� -->
+ LEFT JOIN (
+ SELECT sales_ledger_id, SUM(receipt_payment_amount) AS paid
+ FROM receipt_payment WHERE sales_ledger_id IS NOT NULL GROUP BY sales_ledger_id
+ ) T2 ON T2.sales_ledger_id = T1.id
+ <where>
+ <if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != '' ">
+ T1.customer_name LIKE CONCAT ('%',#{invoiceLedgerDto.searchText},'%')
+ </if>
+ </where>
+ GROUP BY T1.customer_id, T1.customer_name
</select>
<select id="invoiceLedgerProductInfo" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">
@@ -160,5 +179,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