From 0291aea60bfd1f66dbe8138568ee26c4ddaa2a91 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 26 五月 2026 11:41:10 +0800
Subject: [PATCH] 列表查询按照id倒序

---
 src/main/resources/mapper/approve/ApproveProcessMapper.xml |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/approve/ApproveProcessMapper.xml b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
index 995ae0c..f3e628f 100644
--- a/src/main/resources/mapper/approve/ApproveProcessMapper.xml
+++ b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -20,20 +20,26 @@
             <result property="tenantId" column="tenant_id" />
             <result property="approveType" column="approve_type" />
             <result property="approveRemark" column="approve_remark" />
+            <result property="startDateTime" column="start_date_time" />
+            <result property="endDateTime" column="end_date_time" />
     </resultMap>
 
     <sql id="Base_Column_List">
         id,approve_id,approve_user,approve_dept_id,approve_dept_name,approve_user_ids,
         approve_user_names,approve_reason,approve_time,approve_over_time,approve_status,
-        approve_delete,tenant_id,approve_type,approve_remark
+        approve_delete,tenant_id,approve_type,approve_remark,start_date_time,end_date_time
     </sql>
-    <select id="listPage" resultType="com.ruoyi.approve.pojo.ApproveProcess">
+    <select id="listPage" resultType="com.ruoyi.approve.vo.ApproveProcessVo">
         select * from approve_process where approve_delete = 0
         <if test="req.approveId != null and req.approveId != ''">
             and approve_id like concat('%',#{req.approveId},'%')
         </if>
-        <if test="req.approveStatus != null and req.approveStatus != ''">
+        <if test="req.approveStatus != null or req.approveStatus == 0">
             and approve_status = #{req.approveStatus}
         </if>
+        <if test="req.approveType != null ">
+            and approve_type = #{req.approveType}
+        </if>
+        order by id desc
     </select>
 </mapper>

--
Gitblit v1.9.3