From 80939d3c23637db6345bb732283c1eb6234dbfac Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 23 六月 2026 17:45:56 +0800
Subject: [PATCH] fix:发货状态变为已发货需两个条件，一是发货审批通过，而是发货出库审批通过

---
 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 &gt;= #{ew.createTimeStart}
+                and create_time &lt;= #{ew.createTimeEnd}
             </if>
         </where>
+        order by create_time desc
     </select>
 
 </mapper>

--
Gitblit v1.9.3