From b2089cc76bdf959a2e9ff71142dc3fcf0bd9b80b Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 28 六月 2025 13:50:58 +0800
Subject: [PATCH] 2025-06-28 bug修改
---
src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml b/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
index e239178..823ecac 100644
--- a/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
@@ -87,7 +87,8 @@
T2.customer_contract_no,
T2.customer_name,
T3.invoice_no,
- T3.invoice_total,
+ T3.id as invoice_ledger_id,
+ IFNULL(T3.invoice_total,0) AS invoice_total,
T3.invoice_person,
T3.invoice_date,
T4.invoiceFileName
@@ -107,8 +108,11 @@
T2.customer_name LIKE CONCAT('%',#{invoiceRegistrationProductDto.searchText},'%')
)
</if>
- <if test="invoiceRegistrationProductDto.invoiceDate != null">
- AND T3.invoice_date = #{invoiceRegistrationProductDto.invoiceDate}
+ <if test="invoiceRegistrationProductDto.invoiceDateStart != null and invoiceRegistrationProductDto.invoiceDateStart != ''">
+ AND T3.invoice_date >= date_format(#{invoiceRegistrationProductDto.invoiceDateStart}, '%Y-%m-%d')
+ </if>
+ <if test="invoiceRegistrationProductDto.invoiceDateEnd != null and invoiceRegistrationProductDto.invoiceDateEnd != ''">
+ AND T3.invoice_date <= date_format(#{invoiceRegistrationProductDto.invoiceDateEnd}, '%Y-%m-%d')
</if>
</where>
ORDER BY T1.create_time DESC
--
Gitblit v1.9.3