From 01d87b23a7004b71d737f7a82a5a065db8b39a56 Mon Sep 17 00:00:00 2001
From: pserimal <fengli@hsayi.com>
Date: Fri, 16 Jun 2023 17:04:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=AB=AF=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=9D=A2=E8=AF=95=E8=AF=A6=E6=83=85=E5=AE=8C=E5=96=84=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/HyPartnerInterviewPlanMapper.xml   |  27 ++--
 .../cool/store/vo/interview/InterviewVO.java  | 129 +++++-------------
 2 files changed, 56 insertions(+), 100 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
index bb17f44a3..07857ac18 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
@@ -252,28 +252,28 @@
     left join hy_partner_line_info hpll on hpip.partner_line_id = hpll.id
     left join hy_partner_user_info hpui on hpui.partner_id = hpip.partner_id
     <where>
-      <if test="record.partnerName !=null and partnerName!=''">
+      <if test="record.partnerName !=null and record.partnerName!=''">
         hpui.username like concat('%',#{record.partnerName},'%')
       </if>
-      <if test="record.partnerMobile !=null and partnerMobile!=''">
+      <if test="record.partnerMobile !=null and record.partnerMobile!=''">
         hpui.mobile like concat('%',#{record.partnerMobile},'%')
       </if>
-      <if test="record.roomId !=null and roomId!=''">
+      <if test="record.roomId !=null and record.roomId!=''">
         hpip.room_id = #{record.roomId}
       </if>
-      <if test="record.interviewerName !=null and interviewerName!=''">
+      <if test="record.interviewerName !=null and record.interviewerName!=''">
         hpui.username like concat('%',#{record.interviewerName},'%')
       </if>
-      <if test="record.interviewerMobile !=null and interviewerMobile!=''">
+      <if test="record.interviewerMobile !=null and record.interviewerMobile!=''">
         hpui.mobile like concat('%',#{record.interviewerMobile},'%')
       </if>
-      <if test="record.roomStatus !=null and roomStatus!=''">
+      <if test="record.roomStatus !=null and record.roomStatus!=''">
         hpip.room_status = #{record.roomStatus}
       </if>
-      <if test="record.startTime !=null and startTime!=''">
+      <if test="record.startTime !=null and record.startTime!=''">
         hpip.start_time &lt;= #{record.startTime}
       </if>
-      <if test="record.endTime !=null and endTime!=''">
+      <if test="record.endTime !=null and record.endTime!=''">
         hpip.end_time &gt;= #{record.endTime}
       </if>
     </where>
@@ -281,6 +281,17 @@
   </select>
   <select id="getInterviewInfo" resultType="com.cool.store.vo.interview.InterviewVO">
     select hpip.id          as interviewId,
+           hpi.qualify_verify_id as qualifyVerifyId,
+           hpi.pass_time    as passTime,
+           hpi.pass_reason  as passReason,
+           hpi.recorder     as recorderId,
+           hpi.record_time  as recordTime,
+           hpi.summary      as summary,
+           hpi.process_info as processInfo,
+           hpi.auth_code    as processInfo,
+           hpi.expiry_date  as expiryDate,
+           hpi.pass_pdf_url as passPdfUrl,
+           hpi.pass_image_url as passImageUrl,
            hpui.username    as partnerName,
            hpui.mobile      as partnerMobile,
            hpip.room_id     as roomId,
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 d4855f309..0d0a17823 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
@@ -1,19 +1,29 @@
 package com.cool.store.vo.interview;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @Author: young.yu
  * @Date: 2023-06-08  16:26
  * @Description:
  */
+@Data
 @ApiModel(description = "面试信息")
 public class InterviewVO {
     @ApiModelProperty(value = "会议id", required = true)
     private String interviewId;
 
+    @ApiModelProperty("资质审核流程id")
+    private String qualifyVerifyId;
+
+    @ApiModelProperty("审核通过时间")
+    private String passTime;
+
+    @ApiModelProperty("审核通过原因")
+    private String passReason;
+
     @ApiModelProperty(value = "加盟商用户编号")
     private String partnerId;
 
@@ -37,6 +47,22 @@ public class InterviewVO {
 
     @ApiModelProperty(value = "面试官手机号", required = true)
     private String interviewerMobile;
+
+    @ApiModelProperty(value = "记录人id", required = true)
+    private String recorderId;
+
+    @ApiModelProperty(value = "记录人姓名", required = true)
+    private String recorderName;
+
+    @ApiModelProperty(value = "记录人电话", required = true)
+    private String recorderMobile;
+
+    @ApiModelProperty(value = "记录时间", required = true)
+    private String recordTime;
+
+    @ApiModelProperty(value = "面试总结", required = true)
+    private String summary;
+
     @ApiModelProperty(value = "房间状态(0待开放;1已开放;2已关闭)", required = true)
     private String roomStatus;
 
@@ -46,100 +72,19 @@ public class InterviewVO {
     @ApiModelProperty(value = "预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝", required = true)
     private Integer status;
 
+    @ApiModelProperty(value = "面试过程信息", required = false)
+    private String processInfo;
 
-    public String getPartnerId() {
-        return partnerId;
-    }
+    @ApiModelProperty("授权码")
+    private String authCode;
 
-    public void setPartnerId(String partnerId) {
-        this.partnerId = partnerId;
-    }
+    @ApiModelProperty("通过函有效期至")
+    private String expiryDate;
 
-    public String getInterviewerId() {
-        return interviewerId;
-    }
+    @ApiModelProperty("通过函PDF文件URL")
+    private String passPdfUrl;
 
-    public void setInterviewerId(String interviewerId) {
-        this.interviewerId = interviewerId;
-    }
+    @ApiModelProperty("通过函图片文件URL")
+    private String passImageUrl;
 
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getInterviewId() {
-        return interviewId;
-    }
-
-    public void setInterviewId(String interviewId) {
-        this.interviewId = interviewId;
-    }
-
-    public String getPartnerName() {
-        return partnerName;
-    }
-
-    public void setPartnerName(String partnerName) {
-        this.partnerName = partnerName;
-    }
-
-    public String getPartnerMobile() {
-        return partnerMobile;
-    }
-
-    public void setPartnerMobile(String partnerMobile) {
-        this.partnerMobile = partnerMobile;
-    }
-
-    public String getRoomId() {
-        return roomId;
-    }
-
-    public void setRoomId(String roomId) {
-        this.roomId = roomId;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getInterviewerName() {
-        return interviewerName;
-    }
-
-    public void setInterviewerName(String interviewerName) {
-        this.interviewerName = interviewerName;
-    }
-
-    public String getInterviewerMobile() {
-        return interviewerMobile;
-    }
-
-    public void setInterviewerMobile(String interviewerMobile) {
-        this.interviewerMobile = interviewerMobile;
-    }
-
-    public String getRoomStatus() {
-        return roomStatus;
-    }
-
-    public void setRoomStatus(String roomStatus) {
-        this.roomStatus = roomStatus;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
 }