From 18bec32568a7361c7e12517f04463622205b9450 Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Thu, 9 Nov 2023 17:03:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=A2=E8=AF=95=E8=AF=A6=E6=83=85=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=A2=84=E7=BA=A6=E6=83=85=E5=86=B5=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/vo/interview/InterviewVO.java | 9 ++++++++ .../service/impl/InterviewServiceImpl.java | 21 ++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java index 6d70c7dff..a8d640fef 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java @@ -127,4 +127,13 @@ public class InterviewVO { @ApiModelProperty("所属战区id") private String affiliationZone; + @ApiModelProperty("该时间段是否被预约成功") + private Boolean booked; + + @ApiModelProperty("该时间段面试预约人数") + private Integer appointmentCount; + + @ApiModelProperty("该时段是否是自己预约的（不一定代表预约成功）") + private Boolean selfBooked; + } 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 44a90e5d5..99fdb5b74 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 @@ -121,7 +121,7 @@ public class InterviewServiceImpl implements InterviewService { vo.setVideoList(split); vo.setProcessInfo(""); } - //查询面试官和记录人信息（面试官必须有） + //1. 查询面试官和记录人信息（面试官必须有） EnterpriseUserBaseInfoVO interviewerInfo = hyPartnerInterviewPlanMapper.getEnterpriseUserBaseInfo(vo.getInterviewerId()); vo.setInterviewerName(interviewerInfo.getName()); vo.setInterviewerMobile(interviewerInfo.getMobile()); @@ -132,10 +132,10 @@ public class InterviewServiceImpl implements InterviewService { vo.setRecorderMobile(recorderInfo.getMobile()); } } - //查询开发主管信息 + + //2. 查询开发主管信息 if (request.getNeedDevelopmentDirector() != null && request.getNeedDevelopmentDirector()) { //查询所属战区 - String wantShopArea = hyPartnerLineInfoMapper.getAffiliationZoneIdByInterviewPlanId(interviewPlanId); HyIntendDevelopementMappingDO hyIntendDevelopementMappingDO = hyIntendDevMappingDAO.selectByOpenAreaMappingId(Long.valueOf(wantShopArea), "dev"); if (hyIntendDevelopementMappingDO == null) { @@ -145,6 +145,21 @@ public class InterviewServiceImpl implements InterviewService { EnterpriseUserDO development = enterpriseUserService.getDevelopmentByZoneId(hyIntendDevelopementMappingDO.getMappingId()); vo.setDevelopmentDirector(development); } + + //3. 查询该时段预约情况 + //如果还未提交预约申请就没有预约情况，面试完成以后也必要查询了 + if (!vo.getStatus().equals(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_2.getCode())) + && !vo.getStatus().equals(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode())) + && !vo.getStatus().equals(Integer.parseInt(WorkflowStatusEnum.RESERVATION_1.getCode()))) { + return vo; + } + List bookSituations = hyPartnerInterviewPlanMapper.getInterviewBookSituation(vo.getInterviewerId(), vo.getStartTime(), vo.getEndTime()); + if (CollectionUtils.isNotEmpty(bookSituations)) { + HyPartnerInterviewBookSituation bookSituation = bookSituations.get(0); + vo.setBooked(bookSituation.getBooked()); + vo.setSelfBooked(Boolean.TRUE); + vo.setAppointmentCount(bookSituation.getBookingCount()); + } return vo; }