From 83dfd22cd9ce3f6f92c69cbd9bfd974bd8fbdf41 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 05 二月 2026 15:54:26 +0800
Subject: [PATCH] fix: 开票台账中录入人未带出

---
 src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml |   89 +++++++++++++++++++++++---------------------
 1 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml b/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
index cfd47e5..fcaba49 100644
--- a/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
@@ -61,65 +61,70 @@
 
     <select id="invoiceRegistrationProductPage" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">
         SELECT
-            T1.id   ,
-            T1.sales_ledger_id           ,
-            T1.sales_ledger_product_id   ,
-            T1.invoice_registration_id   ,
-            T1.product_category          ,
-            T1.specification_model       ,
-            T1.unit                      ,
-            T1.quantity                  ,
-            T1.tax_rate                  ,
-            T1.tax_inclusive_unit_price  ,
-            T1.tax_inclusive_total_price ,
-            T1.tax_exclusive_total_price ,
-            T1.invoice_type              ,
-            T1.invoice_num               ,
-            T1.invoice_amount            ,
-            T1.no_invoice_num            ,
-            T1.no_invoice_amount         ,
-            T1.create_time               ,
-            T1.create_user               ,
-            T1.update_time               ,
-            T1.update_user               ,
-            T1.tenant_id,
-            T2.sales_contract_no,
-            T2.customer_contract_no,
-            T2.customer_name,
-            T3.invoice_no,
-            T3.id as invoice_ledger_id,
-            IFNULL(T3.invoice_total,0) AS invoice_total,
-            T3.invoice_person,
-            T3.invoice_date,
-            T4.invoiceFileName,
-            T2.project_name
+        T1.id ,
+        T1.sales_ledger_id ,
+        T1.sales_ledger_product_id ,
+        T1.invoice_registration_id ,
+        T1.product_category ,
+        T1.specification_model ,
+        T1.unit ,
+        T1.quantity ,
+        T1.tax_rate ,
+        T1.tax_inclusive_unit_price ,
+        T1.tax_inclusive_total_price ,
+        T1.tax_exclusive_total_price ,
+        T1.invoice_type ,
+        T1.invoice_num ,
+        T1.invoice_amount ,
+        T1.no_invoice_num ,
+        T1.no_invoice_amount ,
+        T1.create_time ,
+        T1.create_user ,
+        T1.update_time ,
+        T1.update_user ,
+        T1.tenant_id,
+        T2.sales_contract_no,
+        T2.customer_contract_no,
+        T2.customer_name,
+        T3.invoice_no,
+        T3.id as invoice_ledger_id,
+        IFNULL(T3.invoice_total,0) AS invoice_total,
+        T3.invoice_person,
+        T3.invoice_date,
+        T4.invoiceFileName,
+        T2.project_name,
+        u.nick_name as invoicePerson
         FROM invoice_registration_product T1
         LEFT JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
+        LEFT JOIN sys_user u ON u.user_id = T1.create_user
         RIGHT JOIN invoice_ledger T3 ON T1.id = T3.invoice_registration_product_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
+        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 = T3.id
         <where>
             <if test="invoiceRegistrationProductDto.searchText != null and invoiceRegistrationProductDto.searchText != '' ">
                 AND (T2.sales_contract_no LIKE CONCAT('%',#{invoiceRegistrationProductDto.searchText},'%')
-                         OR
-                     T2.customer_name LIKE CONCAT('%',#{invoiceRegistrationProductDto.searchText},'%')
-                     )
+                OR
+                T2.customer_name LIKE CONCAT('%',#{invoiceRegistrationProductDto.searchText},'%')
+                )
             </if>
             <if test="invoiceRegistrationProductDto.invoiceDateStart != null and invoiceRegistrationProductDto.invoiceDateStart != ''">
                 AND T3.invoice_date &gt;= str_to_date(#{invoiceRegistrationProductDto.invoiceDateStart}, '%Y-%m-%d')
             </if>
             <if test="invoiceRegistrationProductDto.invoiceDateEnd != null and invoiceRegistrationProductDto.invoiceDateEnd != ''">
-                AND T3.invoice_date &lt; date_add(str_to_date(#{invoiceRegistrationProductDto.invoiceDateEnd}, '%Y-%m-%d'), interval 1 day)
+                AND T3.invoice_date &lt; date_add(str_to_date(#{invoiceRegistrationProductDto.invoiceDateEnd},
+                '%Y-%m-%d'), interval 1 day)
             </if>
             <if test="invoiceRegistrationProductDto.createTimeStart != null ">
-                AND T1.create_time &gt;= date_format(#{invoiceRegistrationProductDto.createTimeStart}, '%Y-%m-%d %H:%i:%s')
+                AND T1.create_time &gt;= date_format(#{invoiceRegistrationProductDto.createTimeStart}, '%Y-%m-%d
+                %H:%i:%s')
             </if>
             <if test="invoiceRegistrationProductDto.createTimeEnd != null ">
-                AND T1.create_time &lt;= date_format(#{invoiceRegistrationProductDto.createTimeStart}, '%Y-%m-%d %H:%i:%s')+interval 1 day
+                AND T1.create_time &lt;= date_format(#{invoiceRegistrationProductDto.createTimeStart}, '%Y-%m-%d
+                %H:%i:%s')+interval 1 day
             </if>
         </where>
         ORDER BY T1.create_time DESC

--
Gitblit v1.9.3