From 62e7209401eb4732d9f5c64b81036c25b27710b3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 17 七月 2025 14:36:53 +0800
Subject: [PATCH] yys 修改销售管理bug
---
src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml b/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
index 9a68cb3..3178871 100644
--- a/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
@@ -87,13 +87,15 @@
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
+ T4.invoiceFileName,
+ T2.project_name
FROM invoice_registration_product T1
LEFT JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
- LEFT JOIN invoice_ledger T3 ON T1.id = T3.invoice_registration_product_id
+ RIGHT JOIN invoice_ledger T3 ON T1.id = T3.invoice_registration_product_id
LEFT JOIN (
SELECT
invoice_ledger_id,
@@ -107,8 +109,17 @@
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>
+ <if test="invoiceRegistrationProductDto.createTimeStart != null ">
+ AND T1.create_time >= date_format(#{invoiceRegistrationProductDto.createTimeStart}, '%Y-%m-%d %H:%i:%s')
+ </if>
+ <if test="invoiceRegistrationProductDto.createTimeEnd != null ">
+ AND T1.create_time <= 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