From e4330e67ae2efc3a010a6f730390d6bae7830429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Mon, 19 Jun 2023 15:19:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=A2=E8=AF=95=E7=9B=B8=E5=85=B3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/FeiShuServiceImpl.java | 8 ++------ .../com/cool/store/controller/InterviewController.java | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java index 42d84ac60..7b59a61e3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java @@ -97,13 +97,9 @@ public class FeiShuServiceImpl implements FeiShuService { for (UserFreeBusyInfoDTO userFreeBusyInfoDTO : UserFreeBusyInfoList) { //如果查询结果中的开始时间和结束时间在时间段内，则设置为忙碌 - if ((startTimeLong > userFreeBusyInfoDTO.getStartTime() && startTimeLong < userFreeBusyInfoDTO.getStartTime()) - || (endTimeLong > userFreeBusyInfoDTO.getStartTime() && endTimeLong < userFreeBusyInfoDTO.getStartTime())) { + if (( userFreeBusyInfoDTO.getStartTime()>startTimeLong && userFreeBusyInfoDTO.getStartTime() < endTimeLong) + || (userFreeBusyInfoDTO.getEndTime() > startTimeLong && userFreeBusyInfoDTO.getEndTime() < endTimeLong)) { freeBusyInfo.setFree(false); - break; - } - if (endTimeLong <= userFreeBusyInfoDTO.getStartTime()) { - break; } } diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewController.java index ffc76a4e6..a66b57cb4 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewController.java @@ -62,7 +62,7 @@ public class InterviewController { } @PostMapping("/finish") - @ApiOperation("修改面试时间") + @ApiOperation("结束面试") public ResponseResult finishInterview(@RequestBody FinishInterviewReq request) { interviewService.finishInterview(request); return ResponseResult.success();