From c9146805855752d7190d4137a0a9f82dfd9a1f13 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 09 十月 2025 16:49:11 +0800
Subject: [PATCH] 添加试用期字段，临近转正时提醒一下

---
 src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml b/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
index 823ecac..3178871 100644
--- a/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml
@@ -91,10 +91,11 @@
             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,
@@ -114,6 +115,12 @@
             <if test="invoiceRegistrationProductDto.invoiceDateEnd != null and invoiceRegistrationProductDto.invoiceDateEnd != ''">
                 AND T3.invoice_date &lt;= date_format(#{invoiceRegistrationProductDto.invoiceDateEnd}, '%Y-%m-%d')
             </if>
+            <if test="invoiceRegistrationProductDto.createTimeStart != null ">
+                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
+            </if>
         </where>
         ORDER BY T1.create_time DESC
     </select>

--
Gitblit v1.9.3