From 39e03b0619683bbb0a14b31a520925cb3d9082d4 Mon Sep 17 00:00:00 2001
From: "feng.li" <fengli@hsayi.com>
Date: Tue, 9 Jan 2024 13:34:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=81=E6=B5=B7=E5=88=97=E8=A1=A8=E7=BA=BF?=
 =?UTF-8?q?=E7=B4=A2=E6=8A=A5=E5=90=8D=E4=BC=9A=E9=94=80=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/store/dao/HyPartnerExhibitionDAO.java  | 6 +++---
 .../com/cool/store/mapper/HyPartnerExhibitionMapper.java | 4 +++-
 .../main/resources/mapper/HyPartnerExhibitionMapper.xml  | 9 ++++-----
 .../store/service/impl/HyPartnerLineInfoServiceImpl.java | 2 +-
 4 files changed, 11 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 2ffb5bcc2..a14cfdb9b 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
@@ -111,11 +111,11 @@ public class HyPartnerExhibitionDAO {
         return hyPartnerExhibitionMapper.queryListByInterviewPlanIds(interviewPlanIds);
     }
 
-    public List<HyPartnerExhibitionDO> queryListByLineIds(List<Long> lindIds) {
-        if (ObjectUtils.isEmpty(lindIds)) {
+    public List<HyPartnerExhibitionDO> queryListByLineIds(List<Long> lindIds, Integer exhibitionPartnerStatusCode) {
+        if (ObjectUtils.isEmpty(lindIds) || exhibitionPartnerStatusCode == null) {
             return new ArrayList<>();
         }
-        return hyPartnerExhibitionMapper.queryListByLineIds(lindIds);
+        return hyPartnerExhibitionMapper.queryListByLineIds(lindIds, exhibitionPartnerStatusCode);
     }
 
     public HyPartnerExhibitionInterviewDO queryPartnerExhibitionInterviewInfo(Long interviewPlanId, Long partnerLineId) {
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 85ac397b2..23cc8d553 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
@@ -79,10 +79,12 @@ public interface HyPartnerExhibitionMapper  {
 
     /**
      * 查询处在会销面试状态中的线索ids
+     *
      * @param lindIds
+     * @param exhibitionPartnerStatusCode
      * @return
      */
-    List<HyPartnerExhibitionDO> queryListByLineIds(@Param("lineIds") List<Long> lindIds);
+    List<HyPartnerExhibitionDO> queryListByLineIds(@Param("lineIds") List<Long> lindIds, @Param("status") Integer exhibitionPartnerStatusCode);
 
     /**
      * 查询线索参加的会销面试相关信息
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
index 1c23444b1..46eaed8e9 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
@@ -384,7 +384,7 @@
   <select id="queryListByLineIds" resultMap="BaseResultMap">
     SELECT partner_line_id, exhibition_id, t3.name AS exhibitionCreatorName, t3.mobile AS exhibitionCreatorMobile
       FROM (
-        SELECT partner_line_id, exhibition_id, creator
+        SELECT partner_line_id, exhibition_id
           FROM hy_partner_exhibition
           WHERE partner_line_id IN (
             <foreach collection="lineIds" item="lineId" separator=",">
@@ -393,16 +393,15 @@
           )
           AND deleted = 0
           -- 面试中状态
-          AND participation_status = 4
+          AND participation_status = #{status}
       ) t1
       INNER JOIN (
-        SELECT id, closed_type
+        SELECT id, creator
           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
+      INNER JOIN enterprise_user t3 ON t2.creator= t3.user_id
   </select>
   <select id="queryPartnerExhibitionInterviewInfo"
           resultType="com.cool.store.entity.HyPartnerExhibitionInterviewDO">
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
index 90ef6d71c..4fb3c64bb 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
@@ -687,7 +687,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         //查询处在会销面试中的线索
         List<HyPartnerExhibitionDO> partnerExhibitions = new ArrayList<>();
         if (CollUtil.isNotEmpty(exhibitionLineIds)) {
-            partnerExhibitions = partnerExhibitionDAO.queryListByLineIds(exhibitionLineIds);
+            partnerExhibitions = partnerExhibitionDAO.queryListByLineIds(exhibitionLineIds, ExhibitionPartnerStatus.INTERVIEWING.getCode());
         }
         List<HyPartnerInterviewPlanDO> hyPartnerInterviewPlanDOS = hyPartnerInterviewPlanDAO.getHyPartnerInterviewPlanByLineIds(lindIds);
         Map<Long, HyPartnerInterviewPlanDO> hyPartnerInterviewPlanDOMap = hyPartnerInterviewPlanDOS.stream().collect(Collectors.toMap(HyPartnerInterviewPlanDO::getPartnerLineId, data -> data));