From 3d556b8defe1ff5b9aeb481bd1d0a67b2ded0192 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 11:31:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/approve/FinReimbursementMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/approve/FinReimbursementMapper.xml b/src/main/resources/mapper/approve/FinReimbursementMapper.xml
index 75ca038..6b4931c 100644
--- a/src/main/resources/mapper/approve/FinReimbursementMapper.xml
+++ b/src/main/resources/mapper/approve/FinReimbursementMapper.xml
@@ -48,10 +48,15 @@
<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 >= #{ew.createTimeStart}
+ and create_time <= #{ew.createTimeEnd}
</if>
</where>
+ order by create_time desc
</select>
</mapper>
--
Gitblit v1.9.3