From 545c8a4b3f45841641562763d9b74a47e8af6f57 Mon Sep 17 00:00:00 2001
From: pserimal <fengli@hsayi.com>
Date: Fri, 9 Jun 2023 18:08:03 +0800
Subject: [PATCH] merge-code

---
 .../store/mapper/HyPartnerInterviewMapper.java   |  1 -
 .../mapper/HyPartnerInterviewMapper.xml          | 16 ++++++++--------
 .../cool/store/vo/PartnerInterviewInfoVO.java    |  2 --
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java
index a70ea5029..af6ade214 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java
@@ -23,7 +23,6 @@ public interface HyPartnerInterviewMapper {
      * dateTime:2023-06-09 05:51
      */
     int updateByPrimaryKeySelective(HyPartnerInterviewDO record);
-    int updateByPrimaryKeySelective(@Param("record") HyPartnerInterviewDO record);
 
     /**
      * 根据加盟商id查询面试信息
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml
index f69958f16..c8229ffec 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml
@@ -246,19 +246,19 @@
   <!-- 根据加盟商id查询面试信息 -->
   <select id="queryByPartnerId" resultMap="PartnerInterviewInfoVO">
     SELECT t1.id interviewId, `status`, start_time, end_time, room_id, t1.partner_id partnerId, t1.interviewer interviewerId
-    FROM hy_partner_interview t1
-    LEFT JOIN hy_partner_interview_plan t2 ON t1.interview_arrangement_id = t2.id
-    WHERE t1.partner_id = #{partnerId}
+      FROM hy_partner_interview t1
+      LEFT JOIN hy_partner_interview_plan t2 ON t1.interview_plan_id = t2.id
+      WHERE t1.partner_id = #{partnerId}
   </select>
   <select id="queryPartnerName" resultType="string">
     SELECT username
-    FROM hy_partner_user_info
-    WHERE partner_id = #{partnerId}
+      FROM hy_partner_user_info
+      WHERE partner_id = #{partnerId}
   </select>
   <select id="queryInterviewerName" resultType="string">
     SELECT name
-    FROM enterprise_user
-    WHERE deleted = 0
-    AND user_id = #{interview}
+      FROM enterprise_user
+      WHERE deleted = 0
+      AND user_id = #{interview}
   </select>
 </mapper>
\ No newline at end of file
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java
index d0c2318c0..50ec23725 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java
@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * @Author suzhuhong
  * @Date 2023/5/30 20:28