From ab5a8eda512763f34884aa1572649759c334eeef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Sun, 8 Oct 2023 10:45:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=A2=E8=AF=95=E6=97=B6?= =?UTF-8?q?=E9=97=B4&=E7=BB=93=E6=9D=9F=E6=B5=81=E7=A8=8B=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=BD=AC=E8=AE=A9=E6=AC=A1=E6=95=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/InterviewServiceImpl.java | 4 +++- .../service/impl/workflow/InterviewWorkFlowService.java | 7 ++++++- 2 files changed, 9 insertions(+), 2 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 1158592fc..c7db5780c 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 @@ -264,7 +264,9 @@ public class InterviewServiceImpl implements InterviewService { throw new ApiException(ErrorCodeEnum.ROOM_STATUS_ERROR); } HyPartnerInterviewPlanDO record = new HyPartnerInterviewPlanDO(); - if(StringUtils.isNotEmpty(interviewInfo.getFeishuCalendarId())&&StringUtils.isNotEmpty(interviewInfo.getFeishuScheduleId())) { + //被委托或者因转让导致的面试官变更的线索不操作日程 + Integer transferTimes = hyPartnerLineInfoMapper.getTransferTimes(interviewInfo.getPartnerLineId()); + if(transferTimes==0&&StringUtils.isNotEmpty(interviewInfo.getFeishuCalendarId())&&StringUtils.isNotEmpty(interviewInfo.getFeishuScheduleId())) { //1.原面试官日程删除 DeleteCalendarEventDTO deleteCalendarEventDTO = new DeleteCalendarEventDTO(); deleteCalendarEventDTO.setCalendarId(interviewInfo.getFeishuCalendarId()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java index 1c4e59fd2..aad9d5d9a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java @@ -17,6 +17,7 @@ import com.cool.store.http.ISVHttpRequest; import com.cool.store.mapper.HyInspectionMapper; import com.cool.store.mapper.HyPartnerInterviewMapper; import com.cool.store.mapper.HyPartnerInterviewPlanMapper; +import com.cool.store.mapper.HyPartnerLineInfoMapper; import com.cool.store.request.CloseFollowRequest; import com.cool.store.request.EntrustOthersReq; import com.cool.store.request.TransferInvestmentManagerRequest; @@ -61,6 +62,9 @@ public class InterviewWorkFlowService extends WorkFlowBaseService { @Autowired private LogService logService; + + @Autowired + private HyPartnerLineInfoMapper hyPartnerLineInfoMapper; @Override public WorkflowStageEnum getWorkFlowStage() { return WorkflowStageEnum.RESERVATION; @@ -77,7 +81,8 @@ public class InterviewWorkFlowService extends WorkFlowBaseService { LoginUserInfo operator = CurrentUserHolder.getUser(); HyPartnerInterviewDO interviewBaseInfo = interviewBaseInfos.get(0); InterviewVO interviewInfo = hyPartnerInterviewPlanMapper.getInterviewInfo(String.valueOf(interviewBaseInfo.getInterviewPlanId())); - if(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_2.getCode()) == interviewBaseInfo.getStatus() + Integer transferTimes = hyPartnerLineInfoMapper.getTransferTimes(interviewInfo.getPartnerLineId()); + if(transferTimes==0&&Integer.parseInt(WorkflowStatusEnum.INTERVIEW_2.getCode()) == interviewBaseInfo.getStatus() && StringUtils.isNotEmpty(interviewInfo.getRoomStatus()) && String.valueOf(RoomStatus.WAIT_FOR_OPEN.getCode()).equals(interviewInfo.getRoomStatus()) && StringUtils.isNotEmpty(interviewInfo.getFeishuCalendarId())