boyue2025/dbd-meeting
3
0
Fork 0
mirror of https://gitee.com/elegant_wings/dbd-meeting.git synced 2025-06-21 20:39:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

20250523-预约记录页面1.筛选加日期选择范围,2.前面列表加序号

Browse Source
This commit is contained in:
luoyu 2025-05-23 14:19:35 +08:00
parent 472c137cff
commit 933534dab2
3 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRecordVo.java
View File

@ -28,6 +28,16 @@ public class MeetingRecordVo implements Serializable {
*/ */
private String filterDate; private String filterDate;
/**
* 查询起始日期（yyyy-MM-dd）
*/
private String startDate;
/**
* 查询结束日期（yyyy-MM-dd）
*/
private String endDate;
private Long id; private Long id;
/** 预约号 */ /** 预约号 */

7
shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml
View File

@ -119,7 +119,12 @@
<if test="device != null and device != ''"> AND room.device LIKE CONCAT('%', #{device}, '%')</if> <if test="device != null and device != ''"> AND room.device LIKE CONCAT('%', #{device}, '%')</if>
<if test="capacityNum != null"> AND capacity_num &lt;= #{capacityNum}</if> <if test="capacityNum != null"> AND capacity_num &lt;= #{capacityNum}</if>
<if test="status != null"> AND status = #{status}</if> <if test="status != null"> AND status = #{status}</if>
<if test="filterDate != null and filterDate != ''"> AND start LIKE CONCAT(#{filterDate}, '%')</if> <if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
AND (start &gt;= CONCAT(#{startDate}, ' 00:00:00') AND start &lt;= CONCAT(#{endDate}, ' 23:59:59'))
</if>
<if test="filterDate != null and filterDate != '' and (startDate == null or startDate == '')">
AND start LIKE CONCAT(#{filterDate}, '%')
</if>
<if test="ext1 != null and ext1 != ''"> AND mr.ext1 is null</if> <if test="ext1 != null and ext1 != ''"> AND mr.ext1 is null</if>
<choose> <choose>
<when test="sort != null and sort == 'create'"> order by mr.create_time desc,status</when> <when test="sort != null and sort == 'create'"> order by mr.create_time desc,status</when>