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

会议室筛选容纳人数

Browse Source
This commit is contained in:
lujiang 2024-10-04 11:05:47 +08:00
parent 18b4216a50
commit c75189fd0e
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java
View File

@ -94,7 +94,8 @@ public class MeetingReservationController extends BaseController {
* * name 会议室名称，模糊查询 * * name 会议室名称，模糊查询
* * typeName 会议室形式，精确查询 * * typeName 会议室形式，精确查询
* * devices 多个会议室设备，模糊查询,逻辑与关系 * * devices 多个会议室设备，模糊查询,逻辑与关系
* * capacityNum 容纳人数，精确查询 * * min 容纳人数，下限（包含）
* * max 容纳人数，上限（包含）
*/ */
@RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR) @RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR)
@PostMapping("getAllRoom") @PostMapping("getAllRoom")

13
shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRoomVo.java
View File

@ -27,6 +27,7 @@ public class MeetingRoomVo implements Serializable {
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY) @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime; private Date endTime;
/** 预约日期 */ /** 预约日期 */
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY) @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private String mrdate; private String mrdate;
@ -35,6 +36,18 @@ public class MeetingRoomVo implements Serializable {
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY) @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Integer timeFormat; private Integer timeFormat;
/**
* 容纳人数 下限
*/
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Integer min;
/**
* 容纳人数 上限
*/
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Integer max;
private Long id; private Long id;
/** /**
* 所属楼层值 * 所属楼层值

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

@ -58,7 +58,7 @@
AND device LIKE CONCAT('%', #{dev}, '%') AND device LIKE CONCAT('%', #{dev}, '%')
</foreach> </foreach>
</if> </if>
<if test="capacityNum != null"> AND room.capacity_num &lt;= #{capacityNum}</if> <if test="min != null and max !=null"> and room.capacity_num &gt;= #{min} AND room.capacity_num &lt;= #{max}</if>
order by room_num order by room_num
</select> </select>