From 60b742746f9c00a2b7d96217463d1aa0eca490d2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 23 十二月 2025 16:40:32 +0800
Subject: [PATCH] feat(production): 修改xml文件

---
 src/main/resources/mapper/sales/ReceiptPaymentMapper.xml |   66 ++++++++++++++++++++------------
 1 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
index df06df6..cf9d93e 100644
--- a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
+++ b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -61,54 +61,69 @@
 
     <select id="bindInvoiceNoRegPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
         SELECT
-        T1.id ,
-        T1.invoice_no ,
-        T1.invoice_total ,
+        T1.id,
+        T1.invoice_no,
+        T1.invoice_total,
         T3.project_name,
-        T1.invoice_person ,
-        T1.invoice_date ,
-        T1.create_time ,
-        T1.create_user ,
-        T1.update_time ,
-        T1.update_user ,
-        T1.tenant_id ,
+        T1.invoice_person,
+        T1.invoice_date,
+        T1.create_time,
+        T1.create_user,
+        T1.update_time,
+        T1.update_user,
+        T1.tenant_id,
         T2.tax_rate,
         T3.sales_contract_no,
         T3.customer_contract_no,
         T3.customer_name,
         T4.invoiceFileName,
         T5.product_category,
-        IFNULL(T6.receipt_payment_amount_total ,0) AS receipt_payment_amount_total,
-        (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total ,0)) AS no_receipt_amount
+        IFNULL(T6.receipt_payment_amount_total, 0) AS receipt_payment_amount_total,
+        (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total, 0)) AS noReceiptAmount
         FROM invoice_ledger T1
         LEFT JOIN invoice_registration_product T2 ON T2.id = T1.invoice_registration_product_id
         LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_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
+        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
         LEFT JOIN sales_ledger_product T5 ON T2.sales_ledger_product_id = T5.id
         LEFT JOIN (
-        SELECT SUM(receipt_payment_amount) AS receipt_payment_amount_total,invoice_ledger_id FROM receipt_payment GROUP
-        BY invoice_ledger_id
+        SELECT
+        SUM(receipt_payment_amount) AS receipt_payment_amount_total,
+        invoice_ledger_id
+        FROM receipt_payment
+        GROUP BY invoice_ledger_id
         ) T6 ON T1.id = T6.invoice_ledger_id
         <where>
-            <if test="c.customerName != null and c.customerName !=''">
-                AND T3.customer_name LIKE CONCAT('%',#{c.customerName},'%')
+            <if test="req.customerName != null and req.customerName !=''">
+                AND T3.customer_name LIKE CONCAT('%',#{req.customerName},'%')
             </if>
-            <if test="c.invoiceLedgerId != null">
-                AND T1.id = #{c.invoiceLedgerId}
+            <if test="req.invoiceLedgerId != null">
+                AND T1.id = #{req.invoiceLedgerId}
             </if>
-            <if test="c.customerContractNo != null and c.customerContractNo !=''">
-                AND T3.customer_contract_no LIKE CONCAT('%',#{c.customerContractNo},'%')
+            <if test="req.customerContractNo != null and req.customerContractNo !=''">
+                AND T3.customer_contract_no LIKE CONCAT('%',#{req.customerContractNo},'%')
             </if>
-            <if test="c.projectName != null and c.projectName !=''">
-                AND T3.project_name LIKE CONCAT('%',#{c.projectName},'%')
+            <if test="req.projectName != null and req.projectName !=''">
+                AND T3.project_name LIKE CONCAT('%',#{req.projectName},'%')
+            </if>
+            <if test="req.invoiceDateStart != null and req.invoiceDateStart != '' ">
+                AND T1.invoice_date &gt;= DATE_FORMAT(#{req.invoiceDateStart},'%Y-%m-%d')
+            </if>
+            <if test="req.invoiceDateEnd != null and req.invoiceDateEnd != '' ">
+                AND T1.invoice_date &lt;= DATE_FORMAT(#{req.invoiceDateEnd},'%Y-%m-%d')
+            </if>
+            <if test="req.status != null and req.status">
+                and (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total, 0)) &gt; 0
             </if>
         </where>
-        ORDER BY T2.create_time DESC
+
+        ORDER BY IFNULL(T2.create_time, T1.create_time) DESC
+
     </select>
 
     <select id="invoiceInfo" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
@@ -183,6 +198,7 @@
 
     <select id="receiptPaymentHistoryListPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
         SELECT
+        T1.id,
         T1.receipt_payment_date,
         T5.customer_name,
         T1.receipt_payment_amount,

--
Gitblit v1.9.3