From 2db7fd950e7c821fc2a048b51f50c6dbfcceed29 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 27 五月 2026 11:10:02 +0800
Subject: [PATCH] 修改排序

---
 src/main/resources/mapper/approve/ApprovalInstanceMapper.xml |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml b/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
index 6b47daa..f632e74 100644
--- a/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
+++ b/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
@@ -39,16 +39,20 @@
                 and ai. template_id = #{ew.templateId}
             </if>
             <if test="ew.businessType != null ">
-                and ai. business_type = #{ew.businessType}
+                and ai.business_type = #{ew.businessType}
             </if>
-            <if test="ew.createTime != null">
-                and ai.create_time between to_date(#{ew.createTimeStart}) and to_date(#{ew.createTimeEnd})
+            <if test="ew.createTimeStart != null and ew.createTimeEnd != null">
+                and ai.apply_time &gt;= #{ew.createTimeStart}
+                and ai.apply_time &lt;= #{ew.createTimeEnd}
             </if>
             <if test="ew.status != null">
                 and ai.status = #{ew.status}
             </if>
+            <if test="ew.applicantName != null and ew.applicantName !=''">
+                and ai.applicant_name = #{ew.applicantName}
+            </if>
         </where>
-        order by ai.id desc
+        order by ai.create_time desc
     </select>
 
 </mapper>

--
Gitblit v1.9.3