From 9f6194912fffa5c513a0168c4611b0f989fb108b Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Wed, 27 Dec 2023 14:27:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=A2=E8=AF=95=E4=BF=A1=E6=81=AF=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=BA=BF=E7=B4=A2=E5=8F=82=E5=8A=A0=E7=9A=84=E4=BC=9A?= =?UTF-8?q?=E9=94=80=E8=B4=9F=E8=B4=A3=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/HyPartnerExhibitionMapper.xml | 11 +++++++---- .../store/entity/HyPartnerExhibitionInterviewDO.java | 6 ++++++ .../java/com/cool/store/vo/interview/InterviewVO.java | 6 ++++++ .../cool/store/service/impl/InterviewServiceImpl.java | 2 ++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml index 34a0a38d3..85c592e9e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml @@ -406,17 +406,20 @@ exhibition_id AS exhibitionId, interview_plan_id AS interviewPlanId, exhibition_name AS exhibitionName, - start_date AS exhibitionDate + start_date AS exhibitionDate, + name AS exhibitionCreatorName, + mobile AS exhibitionCreatorMobile FROM ( SELECT exhibition_id, interview_plan_id FROM hy_partner_exhibition WHERE deleted = 0 AND partner_line_id = #{partnerLineId} AND interview_plan_id = #{interviewPlanId} - ) t1 LEFT JOIN ( - SELECT id, exhibition_name, start_date + ) t1 INNER JOIN ( + SELECT hy_exhibition.id, exhibition_name, start_date, enterprise_user.name, enterprise_user.mobile FROM hy_exhibition - WHERE deleted = 0 + INNER JOIN enterprise_user ON hy_exhibition.creator = enterprise_user.user_id + WHERE hy_exhibition.deleted = 0 ) t2 ON t1.exhibition_id = t2.id 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()); } }