From 9debb6ad025d430f339501815af185abbf2dbae1 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 13 八月 2026 17:05:05 +0800
Subject: [PATCH] fix: 去除入库状态查询条件
---
src/main/resources/mapper/approve/ApproveProcessMapper.xml | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/mapper/approve/ApproveProcessMapper.xml b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
index fef06f7..a2642cb 100644
--- a/src/main/resources/mapper/approve/ApproveProcessMapper.xml
+++ b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -5,38 +5,46 @@
<mapper namespace="com.ruoyi.approve.mapper.ApproveProcessMapper">
<resultMap id="BaseResultMap" type="com.ruoyi.approve.pojo.ApproveProcess">
- <id property="id" column="id" />
- <result property="approveId" column="approve_id" />
- <result property="approveUser" column="approve_user" />
- <result property="approveDeptId" column="approve_dept_id" />
- <result property="approveDeptName" column="approve_dept_name" />
- <result property="approveUserIds" column="approve_user_ids" />
- <result property="approveUserNames" column="approve_user_names" />
- <result property="approveReason" column="approve_reason" />
- <result property="approveTime" column="approve_time" />
- <result property="approveOverTime" column="approve_over_time" />
- <result property="approveStatus" column="approve_status" />
- <result property="approveDelete" column="approve_delete" />
- <result property="tenantId" column="tenant_id" />
- <result property="approveType" column="approve_type" />
- <result property="approveRemark" column="approve_remark" />
+ <id property="id" column="id"/>
+ <result property="approveId" column="approve_id"/>
+ <result property="approveUser" column="approve_user"/>
+ <result property="approveDeptId" column="approve_dept_id"/>
+ <result property="approveDeptName" column="approve_dept_name"/>
+ <result property="approveUserIds" column="approve_user_ids"/>
+ <result property="approveUserNames" column="approve_user_names"/>
+ <result property="approveReason" column="approve_reason"/>
+ <result property="approveTime" column="approve_time"/>
+ <result property="approveOverTime" column="approve_over_time"/>
+ <result property="approveStatus" column="approve_status"/>
+ <result property="approveDelete" column="approve_delete"/>
+ <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,
+ 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.vo.ApproveProcessVo">
- select * from approve_process where approve_delete = 0
+ 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 or req.approveStatus == 0">
+ <if test="req.approveStatus != null">
and approve_status = #{req.approveStatus}
</if>
<if test="req.approveType != null ">
and approve_type = #{req.approveType}
</if>
+ order by approve_time desc, approve_id desc
</select>
+
</mapper>
--
Gitblit v1.9.3