diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java index 02c2ab4..6e0c20b 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java @@ -94,7 +94,8 @@ public class MeetingReservationController extends BaseController { * * name 会议室名称,模糊查询 * * typeName 会议室形式,精确查询 * * devices 多个会议室设备,模糊查询,逻辑与关系 - * * capacityNum 容纳人数,精确查询 + * * min 容纳人数,下限(包含) + * * max 容纳人数,上限(包含) */ @RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR) @PostMapping("getAllRoom") diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRoomVo.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRoomVo.java index f61e9bf..eb60fab 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRoomVo.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRoomVo.java @@ -27,6 +27,7 @@ public class MeetingRoomVo implements Serializable { @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; + /** 预约日期 */ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) private String mrdate; @@ -35,6 +36,18 @@ public class MeetingRoomVo implements Serializable { @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) private Integer timeFormat; + /** + * 容纳人数 下限 + */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private Integer min; + + /** + * 容纳人数 上限 + */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private Integer max; + private Long id; /** * 所属楼层值 diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml index 42d66d1..e3ce6f7 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml @@ -58,7 +58,7 @@ AND device LIKE CONCAT('%', #{dev}, '%') - AND room.capacity_num <= #{capacityNum} + and room.capacity_num >= #{min} AND room.capacity_num <= #{max} order by room_num