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 | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml b/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
index 8f45b99..f632e74 100644
--- a/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
+++ b/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
@@ -24,19 +24,35 @@
<result column="deleted" property="deleted" />
</resultMap>
<select id="listPage" resultType="com.ruoyi.approve.bean.vo.ApprovalInstanceVo">
- select ai.*,su.nick_name as create_user_name from
+ select ai.*,su.nick_name as create_user_name from
approval_instance ai
left join sys_user su on ai.create_user = su.user_id
<where>
deleted = 0
<if test="ew.instanceNo != null">
- and instance_no like concat('%',#{ew.instanceNo},'%')
+ and ai.instance_no like concat('%',#{ew.instanceNo},'%')
</if>
<if test="ew.templateName != null">
- and template_name like concat('%',#{ew.templateName},'%')
+ and ai.template_name like concat('%',#{ew.templateName},'%')
+ </if>
+ <if test="ew.templateId != null ">
+ and ai. template_id = #{ew.templateId}
+ </if>
+ <if test="ew.businessType != null ">
+ and ai.business_type = #{ew.businessType}
+ </if>
+ <if test="ew.createTimeStart != null and ew.createTimeEnd != null">
+ and ai.apply_time >= #{ew.createTimeStart}
+ and ai.apply_time <= #{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