Merge remote-tracking branch 'hsayi/dev/feat/partner1.3_20230904' into dev/feat/partner1.3_20230904

This commit is contained in:
苏竹红
2023-09-01 17:50:50 +08:00

View File

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