From a3e68bcc81179ae585671370bc4364014c7cde18 Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Tue, 9 Jan 2024 13:07:52 +0800 Subject: [PATCH] =?UTF-8?q?webc=E8=8E=B7=E5=8F=96=E7=BA=BF=E7=B4=A2?= =?UTF-8?q?=E9=9D=A2=E8=AF=95=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E4=BC=9A?= =?UTF-8?q?=E9=94=80=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/dao/HyPartnerExhibitionDAO.java | 2 +- .../cool/store/vo/PartnerInterviewInfoVO.java | 7 +++- .../HyPartnerInterviewPlanServiceImpl.java | 2 +- .../impl/PartnerInterviewServiceImpl.java | 37 +++++++++++++++---- 4 files changed, 38 insertions(+), 10 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java index 5f3dde2a6..2ffb5bcc2 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java @@ -104,7 +104,7 @@ public class HyPartnerExhibitionDAO { hyPartnerExhibitionMapper.deleteAllByLineId(partnerLineId); } - public List queryListByInterviewPlanIds(List interviewPlanIds) { + public List queryIdListByInterviewPlanIds(List interviewPlanIds) { if (ObjectUtils.isEmpty(interviewPlanIds)) { return new ArrayList<>(); } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java index f8f810187..f051f63dc 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; import java.util.List; /** @@ -91,4 +90,10 @@ public class PartnerInterviewInfoVO { @ApiModelProperty("该时间段面试预约人数") private Integer appointmentCount; + @ApiModelProperty("线索是否处于会销面试中") + private Boolean whetherExhibitionInterview; + + @ApiModelProperty(value = "线索报名的会销举办日期", example = "2024-01-09") + private String exhibitionDate; + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java index 496ee202f..5b7e01e07 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java @@ -113,7 +113,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan List partnerIdList = interviewPlanList.stream().map(HyPartnerInterviewPlanDO::getPartnerId).collect(Collectors.toList()); List hyPartnerUserInfoDOS = hyPartnerUserInfoDAO.selectByPartnerIds(partnerIdList); List interviewPlanIds = interviewPlanList.stream().map(HyPartnerInterviewPlanDO::getId).collect(Collectors.toList()); - List exhibitionInterviewPlanIds = partnerExhibitionDAO.queryListByInterviewPlanIds(interviewPlanIds); + List exhibitionInterviewPlanIds = partnerExhibitionDAO.queryIdListByInterviewPlanIds(interviewPlanIds); Map hyPartnerUserInfoDOMap = hyPartnerUserInfoDOS.stream().collect(Collectors.toMap(HyPartnerUserInfoDO::getPartnerId, data -> data)); List result = new ArrayList<>(); interviewPlanList.stream() diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java index aac327f99..929691afa 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java @@ -6,14 +6,14 @@ import cn.hutool.core.date.DateUtil; import com.cool.store.constants.RedisConstant; import com.cool.store.context.PartnerUserHolder; import com.cool.store.dao.EnterpriseUserDAO; +import com.cool.store.dao.HyExhibitionDAO; import com.cool.store.dao.HyInterviewDAO; +import com.cool.store.dao.HyPartnerExhibitionDAO; import com.cool.store.dto.log.LogBasicDTO; import com.cool.store.dto.log.ModifyInterviewTimeDTO; import com.cool.store.dto.partner.EnterInterviewDto; import com.cool.store.dto.partner.LineQueryInterviewDto; -import com.cool.store.entity.HyPartnerInterviewDO; -import com.cool.store.entity.HyPartnerInterviewPlanDO; -import com.cool.store.entity.HyPartnerLineInfoDO; +import com.cool.store.entity.*; import com.cool.store.enums.*; import com.cool.store.exception.ApiException; import com.cool.store.exception.ServiceException; @@ -27,7 +27,6 @@ import com.cool.store.request.ModifyInterviewTimeReq; import com.cool.store.service.InterviewService; import com.cool.store.service.LogService; import com.cool.store.service.PartnerInterviewService; -import com.cool.store.utils.CoolDateUtils; import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.StringUtil; import com.cool.store.utils.TRTCUtils; @@ -51,6 +50,9 @@ import org.springframework.transaction.support.TransactionSynchronizationManager import java.text.MessageFormat; import java.util.*; +import static com.cool.store.utils.CoolDateUtils.DATE_FORMAT_DAY; +import static com.cool.store.utils.CoolDateUtils.DATE_FORMAT_SEC; + @Service @Slf4j public class PartnerInterviewServiceImpl implements PartnerInterviewService { @@ -88,6 +90,12 @@ public class PartnerInterviewServiceImpl implements PartnerInterviewService { @Autowired private RedisUtilPool redisUtilPool; + @Autowired + private HyPartnerExhibitionDAO partnerExhibitionDAO; + + @Autowired + private HyExhibitionDAO exhibitionDAO; + @Value("${trtc.sdkAppId}") private Long sdkAppId; @@ -107,7 +115,22 @@ public class PartnerInterviewServiceImpl implements PartnerInterviewService { @Override public PartnerInterviewInfoVO queryByPartnerLineId(LineQueryInterviewDto request) throws ApiException { - return interviewMapper.queryByPartnerLineId(request.getPartnerLineId()); + PartnerInterviewInfoVO partnerInterviewInfo = interviewMapper.queryByPartnerLineId(request.getPartnerLineId()); + //是否是会销面试 + HyPartnerExhibitionDO partnerExhibitionQuery = new HyPartnerExhibitionDO(); + partnerExhibitionQuery.setInterviewPlanId(partnerInterviewInfo.getInterviewPlanId()); + partnerExhibitionQuery.setPartnerLineId(Long.parseLong(request.getPartnerLineId())); + partnerExhibitionQuery.setDeleted(Boolean.FALSE); + HyPartnerExhibitionDO partnerExhibitionRes = partnerExhibitionDAO.querySelective(partnerExhibitionQuery); + //会销日期 + if (partnerExhibitionRes.getInterviewPlanId() != null) { + partnerInterviewInfo.setWhetherExhibitionInterview(Boolean.TRUE); + HyExhibitionDO exhibitionQuery = new HyExhibitionDO(); + exhibitionQuery.setId(partnerExhibitionRes.getExhibitionId()); + List exhibitionDOS = exhibitionDAO.querySelective(exhibitionQuery); + partnerInterviewInfo.setExhibitionDate(DateUtil.format(exhibitionDOS.get(0).getStartDate(), DATE_FORMAT_DAY)); + } + return partnerInterviewInfo; } /** @@ -235,7 +258,7 @@ public class PartnerInterviewServiceImpl implements PartnerInterviewService { //记录日志 PartnerUserInfoVO operator = PartnerUserHolder.getUser(); ModifyInterviewTimeDTO log = ModifyInterviewTimeDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getPartnerId()).operateUsername(operator.getUsername()) - .operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) + .operateTime(DateUtil.format(new Date(), DATE_FORMAT_SEC)) .beforeInterviewTime(interviewInfo.getStartTime()).afterInterviewTime(request.getNewStartBookingTime()).build(); logService.recordPartnerBizLog(operator,interviewInfo.getPartnerLineId(), OperateTypeEnum.MODIFY_INTERVIEW_TIME,log); } @@ -343,7 +366,7 @@ public class PartnerInterviewServiceImpl implements PartnerInterviewService { //记录日志 PartnerUserInfoVO operator = PartnerUserHolder.getUser(); - LogBasicDTO log = LogBasicDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getPartnerId()).operateUsername(operator.getUsername()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)).mobile(operator.getMobile()).build(); + LogBasicDTO log = LogBasicDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getPartnerId()).operateUsername(operator.getUsername()).operateTime(DateUtil.format(new Date(), DATE_FORMAT_SEC)).mobile(operator.getMobile()).build(); logService.recordPartnerBizLog(operator,interviewVO.getPartnerLineId(),OperateTypeEnum.INTERVIEW_APPOINTMENT,log); return vo;