From 74dfb82a264f1b779e50058145953caca907f6f2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 18 十二月 2025 16:57:12 +0800
Subject: [PATCH] yys  巡检管理修改

---
 src/main/resources/mapper/sales/ReceiptPaymentMapper.xml |   45 +++++++++++++++++++++++++++------------------
 1 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
index a52038b..cf9d93e 100644
--- a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
+++ b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -61,38 +61,42 @@
 
     <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="req.customerName != null and req.customerName !=''">
@@ -111,10 +115,15 @@
                 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')
+                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">

--
Gitblit v1.9.3