From 271832d9ad874419b6fd9510edf8f3d5b999ada8 Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Thu, 31 Aug 2023 17:23:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E6=84=8F=E9=9D=A2=E8=AF=95?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=B6=85=E6=97=B6=E6=8F=90=E5=89=8D5?= =?UTF-8?q?=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/InterviewServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java index 96ef724e7..72c830e25 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java @@ -533,8 +533,10 @@ public class InterviewServiceImpl implements InterviewService { record.setFeishuCalendarId(userCalendarEvent.getCalendarId()); record.setFeishuScheduleId(userCalendarEvent.getEventId()); record.setApplicationApproved(1); - //如果同意的时候已经超过预约时间，直接进入面试阶段 - if (DateUtil.parseDateTime(interviewVO.getStartTime()).isBeforeOrEquals(new Date())) { + //如果同意的时候已经超过预约的时间前 5 分钟，直接进入面试已开始阶段 + DateTime interviewStartTime = DateUtil.offsetMinute(DateUtil.parseDateTime(interviewVO.getStartTime()), 5); + Date now = new Date(); + if (interviewStartTime.isBeforeOrEquals(now)) { record.setRoomStatus(RoomStatus.OPEN.getCode()); record.setActualEndTime(new Date()); } @@ -545,7 +547,7 @@ public class InterviewServiceImpl implements InterviewService { HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO(); hyPartnerInterviewDO.setId(Long.valueOf(interviewVO.getInterviewId())); //更新面试状态和线索子流程状态 - if (DateUtil.parseDateTime(interviewVO.getStartTime()).isBeforeOrEquals(new Date())) { + if (interviewStartTime.isBeforeOrEquals(now)) { interviewDAO.updateInterviewWorkflowStatus(request.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_3); } else { interviewDAO.updateInterviewWorkflowStatus(request.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_2); From 18ca1476a74477a6a7487c00b352d20b5464f1ec Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Fri, 1 Sep 2023 14:58:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8C=E6=84=8F=E9=9D=A2=E8=AF=95?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=B6=85=E6=97=B6=E6=8F=90=E5=89=8D5?= =?UTF-8?q?=E5=88=86=E9=92=9FBug-Fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/InterviewServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java index 72c830e25..b21e42f37 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java @@ -534,7 +534,7 @@ public class InterviewServiceImpl implements InterviewService { record.setFeishuScheduleId(userCalendarEvent.getEventId()); record.setApplicationApproved(1); //如果同意的时候已经超过预约的时间前 5 分钟，直接进入面试已开始阶段 - DateTime interviewStartTime = DateUtil.offsetMinute(DateUtil.parseDateTime(interviewVO.getStartTime()), 5); + DateTime interviewStartTime = DateUtil.offsetMinute(DateUtil.parseDateTime(interviewVO.getStartTime()), -5); Date now = new Date(); if (interviewStartTime.isBeforeOrEquals(now)) { record.setRoomStatus(RoomStatus.OPEN.getCode());