From 1a89a2eca92540f2a6e9ed5c140b00610f2f4bfc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 13 四月 2026 14:11:50 +0800
Subject: [PATCH] yys 1.设备巡检，保养加入年维度

---
 src/main/resources/mapper/account/AccountExpenseMapper.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/account/AccountExpenseMapper.xml b/src/main/resources/mapper/account/AccountExpenseMapper.xml
index 1a8d34b..e954562 100644
--- a/src/main/resources/mapper/account/AccountExpenseMapper.xml
+++ b/src/main/resources/mapper/account/AccountExpenseMapper.xml
@@ -10,6 +10,12 @@
         <if test="accountExpense.entryDateStart != null and accountExpense.entryDateStart != '' ">
             AND expense_date &gt;= DATE_FORMAT(#{accountExpense.entryDateStart},'%Y-%m-%d')
         </if>
+        <if test=" accountExpense.supplierName != null and accountExpense.supplierName != ''">
+            AND supplier_name like CONCAT('%',#{accountExpense.supplierName},'%')
+        </if>
+        <if test=" accountExpense.invoiceNumber != null and accountExpense.invoiceNumber != ''">
+            AND invoice_number like CONCAT('%',#{accountExpense.invoiceNumber},'%')
+        </if>
         <if test="accountExpense.entryDateEnd != null and accountExpense.entryDateEnd != '' ">
             AND  expense_date &lt;= DATE_FORMAT(#{accountExpense.entryDateEnd},'%Y-%m-%d')
         </if>

--
Gitblit v1.9.3