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-09-29 13:21:54 +08:00
parent 1cd545d974
commit d47e85026c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,18 +268,13 @@ public class MeetingReservationController extends BaseController {
@PostMapping("beforehand") @PostMapping("beforehand")
public R beforehand(@RequestBody MeetingReservationDTO meetingReservationDTO) { public R beforehand(@RequestBody MeetingReservationDTO meetingReservationDTO) {
Long userId = getLoginStaffId(); Long userId = getLoginStaffId();
IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(userId);
if (staff.getRoomRole() != 5L) return R.error("权限不足！");
MeetingReservation meetingReservation = new MeetingReservation(); MeetingReservation meetingReservation = new MeetingReservation();
if (meetingReservationDTO.getMr().getTimeFormat() > 0) {//非任意时间 meetingReservation.setRoomId(meetingReservationDTO.getMr().getRoomId());
Date start = convert(meetingReservationDTO.getMr().getMrdate(), meetingReservation.getTimeFormat(), true);
Date end = convert(meetingReservationDTO.getMr().getMrdate(), meetingReservation.getTimeFormat(), false);
meetingReservation.setStart(start);
meetingReservation.setEnd(end);
} else {
meetingReservation.setStart(meetingReservationDTO.getMr().getStart()); meetingReservation.setStart(meetingReservationDTO.getMr().getStart());
meetingReservation.setEnd(meetingReservationDTO.getMr().getEnd()); meetingReservation.setEnd(meetingReservationDTO.getMr().getEnd());
} meetingReservation.setTimeFormat(0);
meetingReservation.setTimeFormat(meetingReservationDTO.getMr().getTimeFormat());
meetingReservation.setRoomId(meetingReservationDTO.getMr().getRoomId());
meetingReservation.setTitle("占用"); meetingReservation.setTitle("占用");
String result = meetingReservationService.beforehand(userId, meetingReservation); String result = meetingReservationService.beforehand(userId, meetingReservation);
if (IMeetingReservationService.OK.equals(result)) { if (IMeetingReservationService.OK.equals(result)) {

7
shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java
View File

@ -170,7 +170,12 @@ public class MeetingReservationServiceImpl implements IMeetingReservationService
public String operateMeetingReservation(Long currentUserId, Long id, MrOperate operate, String content) { public String operateMeetingReservation(Long currentUserId, Long id, MrOperate operate, String content) {
MeetingReservation meetingReservation = meetingReservationMapper.selectMeetingReservationById(id); MeetingReservation meetingReservation = meetingReservationMapper.selectMeetingReservationById(id);
if (meetingReservation == null) return "未找到预约记录"; if (meetingReservation == null) return "未找到预约记录";
if (meetingReservation.getStatus() != 5) return "预约记录不能" + operate.getValue(); if (MrOperate.CANCEL.equals(operate) && (meetingReservation.getStatus() < 5 || meetingReservation.getStatus() > 7)) {
return "预约记录不能" + operate.getValue();
}
if (!MrOperate.CANCEL.equals(operate) && meetingReservation.getStatus() != 5) {
return "预约记录不能" + operate.getValue();
}
if (MrOperate.CANCEL.equals(operate) && !meetingReservation.getCreateBy().equals(currentUserId.toString())) if (MrOperate.CANCEL.equals(operate) && !meetingReservation.getCreateBy().equals(currentUserId.toString()))
return "不能取消非本人的预约记录"; return "不能取消非本人的预约记录";
Date now = new Date(); Date now = new Date();