From c5a0ff2661fe362dddbe88c6a28d19c48c24c39b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 21 十月 2024 20:39:32 +0800 Subject: [PATCH] 最新版本541200007 --- server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java index b7f9d3a..f4c09b9 100644 --- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java +++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java @@ -15,6 +15,7 @@ import com.doumee.dao.web.response.MeetingDetailResponse; import com.doumee.dao.web.response.MeetingListResponse; import com.doumee.dao.web.response.MonthDataResponse; +import com.doumee.dao.web.response.RoomDetailResponse; import com.doumee.service.business.BookingsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -88,7 +89,7 @@ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true), }) public ApiResponse<MeetingDetailResponse> meetingDetail( @RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestParam Integer id) { - return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getMeetingDetail(id)); + return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getMeetingDetail(id,getLoginUser(token).getId())); } @ApiOperation("鑾峰彇浼氳寮�闂ㄤ簩缁寸爜") @@ -141,6 +142,26 @@ return ApiResponse.success("鎿嶄綔鎴愬姛"); } + @ApiOperation("鎻愬墠寮�濮嬩細璁�") + @PostMapping("/startEarly") + public ApiResponse startEarly(@RequestBody BusinessOverDTO businessOverDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + LoginUserInfo user = getLoginUser(token); + businessOverDTO.setUserId(user.getId()); + businessOverDTO.setStartType(Constants.ZERO); + bookingsService.startEarly(businessOverDTO); + return ApiResponse.success("鎿嶄綔鎴愬姛"); + } + + @ApiOperation("寮�濮嬩細璁�") + @PostMapping("/start") + public ApiResponse start(@RequestBody BusinessOverDTO businessOverDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + LoginUserInfo user = getLoginUser(token); + businessOverDTO.setUserId(user.getId()); + businessOverDTO.setStartType(Constants.ONE); + bookingsService.start(businessOverDTO); + return ApiResponse.success("鎿嶄綔鎴愬姛"); + } + @ApiOperation("鎻愬墠缁撴潫浼氳") @PostMapping("/reservationOver") public ApiResponse reservationOver(@RequestBody BusinessOverDTO businessOverDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { @@ -152,4 +173,5 @@ + } -- Gitblit v1.9.3