From 6c28b504879b02c4a144585c6d6b327d0bb47657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Fri, 5 Jan 2024 17:20:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=A2=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/HyPartnerExhibitionMapper.xml    | 1 +
 .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml      | 3 +--
 .../java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java  | 2 ++
 .../store/service/impl/exhibition/ExhibitionServiceImpl.java   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
index f36bccfa5..1c23444b1 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
@@ -84,6 +84,7 @@
   <select id="exhibitionLineList" resultType="com.cool.store.dto.exhibition.ExhibitionLineDTO">
     select
       hpe.exhibition_id as exhibitionId ,
+      hpe.interview_plan_id as planId,
       hpe.partner_id as partnerId,
       hpe.partner_line_id as lineId,
       hpe.participation_status as participationStatus,
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index 5d02e3608..e02ed0e83 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -1035,9 +1035,8 @@
     from  hy_partner_interview_plan a
     left join enterprise_user b on a.interviewer = b.user_id
     <where>
-      and a.deleted = 0
       <if test="list!=null and list.size>0">
-        <foreach collection="list" item="lineId" open="and a.partner_line_id in (" close=")" separator=",">
+        <foreach collection="list" item="lineId" open="and a.id in (" close=")" separator=",">
           #{lineId}
         </foreach>
       </if>
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java
index 7876d538e..c1e034d47 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java
@@ -30,6 +30,8 @@ public class ExhibitionLineDTO {
 
     private Integer id;
 
+    private Long planId;
+
     private  Integer expectedVisitorsCount;
 
     private String expectedInformation;
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java
index 894082f3d..096652076 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java
@@ -483,7 +483,7 @@ public class ExhibitionServiceImpl implements ExhibitionService {
         if (CollectionUtils.isEmpty(exhibitionLineDTOS)){
             return pageInfo;
         }
-        List<Long> lineIds = exhibitionLineDTOS.stream().map(ExhibitionLineDTO::getLineId).collect(Collectors.toList());
+        List<Long> lineIds = exhibitionLineDTOS.stream().map(ExhibitionLineDTO::getPlanId).collect(Collectors.toList());
         //面试官info
         List<LineInterviewDTO> lineInterviewList = hyPartnerLineInfoDAO.lineInterviewList(lineIds);
         Map<Long, LineInterviewDTO> lineInterviewMap = lineInterviewList.stream().collect(Collectors.toMap(LineInterviewDTO::getLineId, date -> date));