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();