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 38f429bff..af5ee20e1 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