diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index a8fc7bded..0020aa4b7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -188,7 +188,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { Map userDOMap = userList.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, data -> data)); //更新面试官(预约面试全阶段和合作资格面试待面试阶段都需要变更面试官) - //待预约状态及之前还未生成面试信息,因此不做表更面试官操作 + //待预约状态及之前还未生成面试信息,因此不做变更面试官操作 if ( (WorkflowStageEnum.INTERVIEW.getCode().equals(hyPartnerLineInfoDO.getWorkflowStage()) && WorkflowStatusEnum.INTERVIEW_2.getCode().equals(hyPartnerLineInfoDO.getWorkflowStatus())) || (WorkflowStageEnum.RESERVATION.getCode().equals(hyPartnerLineInfoDO.getWorkflowStage())) && !WorkflowStatusEnum.RESERVATION_0.getCode().equals(hyPartnerLineInfoDO.getWorkflowStatus())) { workFlowService.transferInvestmentManager(WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()),request); 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 bd168ce9e..96ef724e7 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,6 +533,11 @@ public class InterviewServiceImpl implements InterviewService { record.setFeishuCalendarId(userCalendarEvent.getCalendarId()); record.setFeishuScheduleId(userCalendarEvent.getEventId()); record.setApplicationApproved(1); + //如果同意的时候已经超过预约时间,直接进入面试阶段 + if (DateUtil.parseDateTime(interviewVO.getStartTime()).isBeforeOrEquals(new Date())) { + record.setRoomStatus(RoomStatus.OPEN.getCode()); + record.setActualEndTime(new Date()); + } record.setUpdateTime(new Date()); hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(record); @@ -540,7 +545,11 @@ public class InterviewServiceImpl implements InterviewService { HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO(); hyPartnerInterviewDO.setId(Long.valueOf(interviewVO.getInterviewId())); //更新面试状态和线索子流程状态 - interviewDAO.updateInterviewWorkflowStatus(request.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_2); + if (DateUtil.parseDateTime(interviewVO.getStartTime()).isBeforeOrEquals(new Date())) { + interviewDAO.updateInterviewWorkflowStatus(request.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_3); + } else { + interviewDAO.updateInterviewWorkflowStatus(request.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_2); + } // hyPartnerInterviewDO.setStatus(Integer.valueOf(WorkflowStatusEnum.INTERVIEW_2.getCode())); hyPartnerInterviewDO.setUpdateTime(new Date()); hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/WorkFlowBaseService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/WorkFlowBaseService.java index 4b60a7017..64c56f29c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/WorkFlowBaseService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/WorkFlowBaseService.java @@ -26,7 +26,7 @@ public abstract class WorkFlowBaseService { public abstract void endProcess(CloseFollowRequest request) throws ApiException; /** - * 转让招商经理 + * 转让招商经理(实际是转让面试官,转让招商经理的操作在前置已进行) * @param request */ public abstract void transferInvestmentManager(TransferInvestmentManagerRequest request) throws ApiException;