From 4b4e2f94dc65145fecefc344b39875e18c648562 Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Wed, 27 Dec 2023 13:51:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=81=E6=B5=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BC=9A=E9=94=80=E9=9D=A2=E8=AF=95=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E7=BA=BF=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/dao/HyPartnerExhibitionDAO.java | 3 +-- .../mapper/HyPartnerExhibitionMapper.java | 2 +- .../mapper/HyPartnerExhibitionMapper.xml | 10 +++++---- .../store/entity/HyPartnerExhibitionDO.java | 13 ++++++++--- .../cool/store/vo/PrivateSeaLineListVo.java | 22 ++++++++++++++----- .../impl/HyPartnerLineInfoServiceImpl.java | 9 ++++++-- .../cool/store/service/EventRequestTest.java | 14 ++++++------ 7 files changed, 48 insertions(+), 25 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 891b2dd83..2c889d66e 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 @@ -3,7 +3,6 @@ package com.cool.store.dao; import com.cool.store.dto.exhibition.ExhibitionLineBaseDTO; import com.cool.store.dto.exhibition.ExhibitionLineDTO; import com.cool.store.dto.exhibition.PartnerSignUpDTO; -import com.cool.store.entity.HyExhibitionDO; import com.cool.store.entity.HyPartnerExhibitionDO; import com.cool.store.entity.HyPartnerExhibitionInterviewDO; import com.cool.store.mapper.HyPartnerExhibitionMapper; @@ -111,7 +110,7 @@ public class HyPartnerExhibitionDAO { return hyPartnerExhibitionMapper.queryListByInterviewPlanIds(interviewPlanIds); } - public List queryListByLineIds(List lindIds) { + public List queryListByLineIds(List lindIds) { if (ObjectUtils.isEmpty(lindIds)) { return new ArrayList<>(); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java index 391614fdb..3993ef167 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java @@ -81,7 +81,7 @@ public interface HyPartnerExhibitionMapper { * @param lindIds * @return */ - List queryListByLineIds(@Param("lineIds") List lindIds); + List queryListByLineIds(@Param("lineIds") List lindIds); /** * 查询线索参加的会销面试相关信息 diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml index 51adf8db5..34a0a38d3 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml @@ -377,10 +377,10 @@ ) - + SELECT partner_line_id, exhibition_id, t3.name AS exhibitionCreatorName, t3.mobile AS exhibitionCreatorMobile FROM ( - SELECT partner_line_id, exhibition_id + SELECT partner_line_id, exhibition_id, creator FROM hy_partner_exhibition WHERE partner_line_id IN ( @@ -388,14 +388,16 @@ ) AND deleted = 0 + -- 面试中状态 AND participation_status = 4 ) t1 - LEFT JOIN ( + INNER JOIN ( SELECT id, closed_type FROM hy_exhibition WHERE deleted = 0 AND closed_type = 0 ) t2 ON t1.exhibition_id = t2.id + INNER JOIN enterprise_user t3 ON t1.creator = t3.user_id WHERE closed_type = 0 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerExhibitionInterviewDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerExhibitionInterviewDO.java index cb2e7213a..3b66677bb 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerExhibitionInterviewDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerExhibitionInterviewDO.java @@ -23,4 +23,10 @@ public class HyPartnerExhibitionInterviewDO { @ApiModelProperty("面试计划id") private Long interviewPlanId; + @ApiModelProperty("进行面试的会销创建人姓名") + private String exhibitionCreatorName; + + @ApiModelProperty("进行面试的会销创建人手机号") + private String exhibitionCreatorMobile; + } 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 09de6bc55..b6c42af22 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 @@ -145,4 +145,10 @@ public class InterviewVO { @ApiModelProperty("展会日期") private String exhibitionDate; + @ApiModelProperty("进行面试的会销创建人姓名") + private String exhibitionCreatorName; + + @ApiModelProperty("进行面试的会销创建人手机号") + private String exhibitionCreatorMobile; + } 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 ba6ad517b..defc6efe4 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 @@ -158,6 +158,8 @@ public class InterviewServiceImpl implements InterviewService { vo.setWhetherExhibitionInterview(Boolean.TRUE); vo.setExhibitionName(partnerExhibitionInterview.getExhibitionName()); vo.setExhibitionDate(partnerExhibitionInterview.getExhibitionDate()); + vo.setExhibitionCreatorName(partnerExhibitionInterview.getExhibitionCreatorName()); + vo.setExhibitionCreatorMobile(partnerExhibitionInterview.getExhibitionCreatorMobile()); } }