From d6a1114f3473f86721176bc9d17ba7f35b0bddb7 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 13 五月 2025 16:53:59 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after
---
src/main/resources/mapper/sales/InvoiceLedgerMapper.xml | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml b/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
index 093b5c4..6d38405 100644
--- a/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
@@ -21,10 +21,17 @@
T1.tenant_id ,
T2.customer_name,
T3.customer_contract_no,
- T3.salesman
+ 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
+ LEFT JOIN (
+ SELECT
+ invoice_ledger_id,
+ GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
+ FROM invoice_ledger_file GROUP BY invoice_ledger_id
+ ) T4 ON T4.invoice_ledger_id = T1.id
<where>
<if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != ''">
AND (
@@ -40,23 +47,33 @@
<select id="invoiceLedgerList" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_contract_no ,
- T1.customer_id ,
- T1.invoice_no ,
- T1.invoice_amount ,
- T1.tax_rate ,
- T1.invoice_person ,
- T1.invoice_date ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id ,
- T2.customer_name
+ T1.id ,
+ T1.sales_ledger_id ,
+ T1.sales_contract_no ,
+ T1.customer_id ,
+ T1.invoice_no ,
+ T1.invoice_amount ,
+ T1.tax_rate ,
+ T1.invoice_person ,
+ T1.invoice_date ,
+ T1.create_time ,
+ T1.create_user ,
+ T1.update_time ,
+ T1.update_user ,
+ T1.tenant_id ,
+ T2.customer_name,
+ T3.salesman,
+ 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
+ LEFT JOIN (
+ SELECT
+ invoice_ledger_id,
+ GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
+ FROM invoice_ledger_file GROUP BY invoice_ledger_id
+ ) T4 ON T4.invoice_ledger_id = T1.id
<where>
<if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != ''">
AND (
--
Gitblit v1.9.3