From f582aad4d86f811649d5b1f2c17f0ed84ab150df Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 26 五月 2026 09:32:09 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_襄垣县洁鑫商贸有限公司

---
 src/main/resources/mapper/approve/FinReimbursementMapper.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/approve/FinReimbursementMapper.xml b/src/main/resources/mapper/approve/FinReimbursementMapper.xml
index 75ca038..72756c4 100644
--- a/src/main/resources/mapper/approve/FinReimbursementMapper.xml
+++ b/src/main/resources/mapper/approve/FinReimbursementMapper.xml
@@ -48,8 +48,12 @@
             <if test="ew.applicantName != null and ew.applicantName != ''">
                 and applicant_name like concat('%',#{ew.applicantName},'%')
             </if>
-            <if test="ew.createTimeStart != null and ew.createTimeStart !=''">
-                and create_time between to_date(#{ew.createTimeStart}) and to_date(#{ew.createTimeEnd})
+            <if test="ew.applicantCode != null and ew.applicantCode != ''">
+                and applicant_code like concat('%',#{ew.applicantCode},'%')
+            </if>
+            <if test="ew.createTimeStart != null and ew.createTimeStart !='' and ew.createTimeEnd != null and ew.createTimeEnd != ''">
+                and create_time &gt;= #{ew.createTimeStart}
+                and create_time &lt;= #{ew.createTimeEnd}
             </if>
         </where>
     </select>

--
Gitblit v1.9.3