From 19c43417c04580d4025a6ebeb9f09d56e3cf6c4b Mon Sep 17 00:00:00 2001 From: lujiang Date: Tue, 24 Sep 2024 22:01:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MeetingReservationController.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) 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 506c391..d9c9791 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 @@ -89,6 +89,12 @@ public class MeetingReservationController extends BaseController { * mrdate：预约日期，格式：2024-09-23 * timeFormat：预约时间格式：0 任意时间（管理员），1上午，2下午，3晚上 4 全天。 * 值为0时，读取startTime和endTime为预约会议时间范围；其他值读取mrdate，再拼接时间为预约会议时间范围。 + * + * * floor 所属楼层名称，精确查询 + * * name 会议室名称，模糊查询 + * * typeName 会议室形式，精确查询 + * * device 会议室设备，模糊查询 + * * capacityNum 容纳人数，精确查询 */ @RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR) @PostMapping("getAllRoom") @@ -124,7 +130,7 @@ public class MeetingReservationController extends BaseController { * 无参，返回所有部门id及名称，已去重。 * */ @RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR) - @PostMapping("getOrg") + @RequestMapping("getOrg") public R getOrg() { return R.ok().put("data", meetingUtoService.getOrg()); } @@ -139,7 +145,7 @@ public class MeetingReservationController extends BaseController { * personNum 会议室容纳人数，已去重。 */ @RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR) - @PostMapping("getConstData") + @RequestMapping("getConstData") public R getConstData() { JSONObject jsonObject = meetingReservationService.getConstData(); return R.ok().put("data", jsonObject); @@ -176,10 +182,10 @@ public class MeetingReservationController extends BaseController { /* 预定时间的转换 */ private Date convert(String date, Integer timeFormat, boolean start) { String time = ""; - if (timeFormat == 1) time = start ? " 08:30:00" : " 12:00:00";//1 上午 - if (timeFormat == 2) time = start ? " 12:00:01" : " 17:30:00";//2 下午 - if (timeFormat == 3) time = start ? " 17:30:01" : " 23:59:59";//3 晚上 - if (timeFormat == 4) time = start ? " 08:30:00" : " 23:59:59";//4 全天 + if (timeFormat == 1) time = start ? " 08:00:00" : " 12:00:00";//1 上午 + if (timeFormat == 2) time = start ? " 12:00:01" : " 18:00:00";//2 下午 + if (timeFormat == 3) time = start ? " 18:00:01" : " 23:59:59";//3 晚上 + if (timeFormat == 4) time = start ? " 08:00:00" : " 23:59:59";//4 全天 try { return DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, date + time); } catch (Exception e) { @@ -285,7 +291,7 @@ public class MeetingReservationController extends BaseController { * serveWaiter：会务服务组 */ @RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR) - @PostMapping("getWaiter") + @RequestMapping("getWaiter") public R getWaiter() { IcsCustomerStaff p = new IcsCustomerStaff(); p.setRoomRole(3); @@ -333,7 +339,7 @@ public class MeetingReservationController extends BaseController { * 参数：id，预约记录id。物理删除（包括所有关联数据），不可恢复 */ @RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR) - @RequestMapping("delete") + @PostMapping("delete") public R delete(@RequestBody Map param) { Long id = param.get("id"); return toAjax(meetingReservationService.deleteMeetingReservationById(id)); @@ -350,7 +356,7 @@ public class MeetingReservationController extends BaseController { * waiters，分配的会务人员 */ @RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR) - @RequestMapping("getInfo") + @PostMapping("getInfo") public R get(@RequestBody Map param) { Long id = param.get("id"); MeetingReservation meetingReservation = meetingReservationService.selectMeetingReservationById(id);