From 89e7a7ad6a5f8ee244b552346212e54e279131f8 Mon Sep 17 00:00:00 2001 From: lujiang Date: Mon, 4 Nov 2024 09:28:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=9A=E8=AE=AE=E5=AE=A4?= =?UTF-8?q?=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MeetingReservationController.java | 20 ++++++++++++++++ .../mapper/MeetingReservationMapper.java | 3 +++ .../service/IMeetingReservationService.java | 2 ++ .../impl/MeetingReservationServiceImpl.java | 5 ++++ .../java/com/ics/admin/vo/MeetingRoomVo.java | 4 ++++ .../mapper/admin/MeetingReservationMapper.xml | 24 +++++++++++++++++++ 6 files changed, 58 insertions(+) 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 188d8f8..3838bb1 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 @@ -92,6 +92,7 @@ public class MeetingReservationController extends BaseController { * 返回值读取：为0时；任然读取status 0可预约 1不可预约 * 为1时；读取 am，上午 0可预约 1不可预约 pm，下午 0可预约 1不可预约 night，晚上 0可预约 1不可预约 * + * type 会议室筛选条件：already 已预约 without 未预约 going 开会中 free 空闲 * * floor 所属楼层名称，精确查询 * * name 会议室名称，模糊查询 * * typeName 会议室形式，精确查询 @@ -106,6 +107,12 @@ public class MeetingReservationController extends BaseController { Date start = convert(meetingRoomVo.getMrdate(), 1, true); Date end = convert(meetingRoomVo.getMrdate(), 1, false); if (start == null || end == null) return R.error("预约时间解析错误"); + + List roomTypes = null; + if (StringUtils.isNotBlank(meetingRoomVo.getType())) { + roomTypes = meetingReservationService.getAllRoomByType(meetingRoomVo);//按类型获取会议室 + } + meetingRoomVo.setStartTime(start); meetingRoomVo.setEndTime(end); List am = meetingReservationService.getAllRoom(meetingRoomVo);//上午 @@ -119,6 +126,19 @@ public class MeetingReservationController extends BaseController { meetingRoomVo.setStartTime(start); meetingRoomVo.setEndTime(end); List night = meetingReservationService.getAllRoom(meetingRoomVo);//晚上 + + if (roomTypes != null) { + for (MeetingRoomVo mro : roomTypes) { + for (MeetingRoomVo amro : am) { + if (mro.getId() == amro.getId()) { + mro.setStatus(amro.getStatus()); + break; + } + } + } + am = roomTypes;//换位 + } + for (MeetingRoomVo mro : am) { mro.setAm(mro.getStatus());//设置上午状态 mro.setStatus(-1); diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/MeetingReservationMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/MeetingReservationMapper.java index 9e01634..9d652ff 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/MeetingReservationMapper.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/MeetingReservationMapper.java @@ -18,6 +18,9 @@ import java.util.List; @Mapper public interface MeetingReservationMapper { + /** 根据进类型回去指定日期是否可以预约的会议室 */ + List getAllRoomByType(MeetingRoomVo meetingRoomVo); + /** 获取所有会议室的预约状态 */ List getAllRoom(MeetingRoomVo meetingRoomVo); diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IMeetingReservationService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IMeetingReservationService.java index f052318..a847a10 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IMeetingReservationService.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IMeetingReservationService.java @@ -25,6 +25,8 @@ public interface IMeetingReservationService { */ JSONObject getConstData(); + /** 根据进类型回去指定日期是否可以预约的会议室 */ + List getAllRoomByType(MeetingRoomVo meetingRoomVo); /** * 获取可预约的会议室 * @param meetingRoomVo diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java index ad220f3..56110d1 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java @@ -117,6 +117,11 @@ public class MeetingReservationServiceImpl implements IMeetingReservationService return datas; } + @Override + public List getAllRoomByType(MeetingRoomVo meetingRoomVo) { + return meetingReservationMapper.getAllRoomByType(meetingRoomVo); + } + @Override public List getAllRoom(MeetingRoomVo meetingRoomVo) { return meetingReservationMapper.getAllRoom(meetingRoomVo); 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 4051a19..b00f93d 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 @@ -36,6 +36,10 @@ public class MeetingRoomVo implements Serializable { @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) private Integer timeFormat; + /** already 已预约 without 未预约 going 开会中 free 空闲 */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private String type; + /** * 容纳人数 下限 */ 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 04cf254..45fc967 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 @@ -37,6 +37,30 @@ SELECT id, sn, room_id, start, `end`, time_format, title, person_num, leader, booking_user_name, booking_user_phone, user_org_id, user_org, status, operate, remark, ext1, ext2, ext3, delete_flag, create_by, create_time, update_by, update_time, tenant_id, park_id FROM ics_meeting_reservation + + +