Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

# Conflicts: # coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java # coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
2023-06-17 18:19:17 +08:00
parent dcb3d1097c 4bdfc0b271
commit a3c94a6543
43 changed files with 580 additions and 223 deletions
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java
@@ -45,4 +45,10 @@ public class HyPartnerBaseInfoDAO {
        return hyPartnerBaseInfoMapper.getByPartnerIdAndLineId(partnerId, partnerLineId);
    }

+    public Long getLineIdByIdCard(String idCard){
+        if (StringUtils.isEmpty(idCard)){
+            return null;
+        }
+        return hyPartnerBaseInfoMapper.getLineIdByIdCard(idCard);
+    }
 }
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDAO.java
@@ -7,6 +7,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;

 import javax.annotation.Resource;
@@ -61,4 +62,16 @@ public class RegionDAO {
        return ListUtils.emptyIfNull(regionList).stream().collect(Collectors.toMap(RegionDO::getRegionId, RegionDO::getName));
    }

+    /**
+     * 获取区域
+     * @param regionId
+     * @return
+     */
+    public RegionDO getRegionInfoByRegionId(String regionId){
+        if(StringUtils.isBlank(regionId)){
+            return null;
+        }
+        return regionMapper.getRegionInfoByRegionId(regionId);
+    }
+
 }
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java
@@ -36,4 +36,6 @@ public interface HyPartnerBaseInfoMapper {

    HyPartnerBaseInfoDO getByPartnerIdAndLineId(@Param("partnerId") String partnerId, @Param("partnerLineId") Long partnerLineId);

+    Long getLineIdByIdCard(@Param("idCard") String idCard);
+
 }
--- 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
@@ -2,6 +2,7 @@ package com.cool.store.mapper;

 import com.cool.store.entity.HyPartnerInterviewDO;
 import com.cool.store.vo.EnterInterviewVO;
+import com.cool.store.vo.EnterpriseUserBaseInfoVO;
 import com.cool.store.vo.PartnerInterviewInfoVO;
 import com.cool.store.vo.PartnerPassLetterDetailVO;
 import org.apache.ibatis.annotations.Param;
@@ -37,13 +38,13 @@ public interface HyPartnerInterviewMapper {
     * 修改面试状态
     * 预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝
     */
-    int updateInterviewStatus(@Param("interviewId") String interviewId, @Param("status") Integer status);
+    int updateInterviewStatus(@Param("interviewPlanId") String interviewPlanId, @Param("status") Integer status);

    /**
     * 修改面试实际开始时间
     * @param dateTime "yyyy-MM-dd HH:mm:ss"
     */
-    int updateActualStartTime(@Param("interviewId") String interviewId, @Param("dateTime") String dateTime);
+    int updateActualStartTime(@Param("interviewPlanId") String interviewPlanId, @Param("dateTime") String dateTime);

    /**
     * 修改加盟商或面试官进入面试时间
@@ -51,28 +52,28 @@ public interface HyPartnerInterviewMapper {
     * @param dateTime "yyyy-MM-dd HH:mm:ss"
     * @return
     */
-    int updateEnterTime(@Param("interviewId") String interviewId, @Param("userType") Integer userType, @Param("dateTime") String dateTime);
+    int updateEnterTime(@Param("interviewPlanId") String interviewPlanId, @Param("userType") Integer userType, @Param("dateTime") String dateTime);

    /**
     * 将加盟商是否参会修改为参会
     * 0未参加，1参加
     */
-    int updateWhetherPartnerEnter(@Param("interviewId") String interviewId);
+    int updateWhetherPartnerEnter(@Param("interviewPlanId") String interviewPlanId);

    /**
     * 根据会议 id 查询面试官 id
     */
-    EnterInterviewVO getInterviewerByInterviewId(@Param("interviewId") String interviewId);
+    EnterInterviewVO getInterviewerByInterviewPlanId(@Param("interviewPlanId") String interviewPlanId);

    /**
     * 获取通知函详情
     */
-    PartnerPassLetterDetailVO getPassLetterDetail(@Param("interviewId") String interviewId);
+    PartnerPassLetterDetailVO getPassLetterDetail(@Param("interviewPlanId") String interviewPlanId);

    /**
     * 生成通过函 pdf 后修改
     */
-    int updatePassLetterInfo(@Param("passCode") String passCode, @Param("passFileUrl") String passFileUrl, @Param("expiryDate") String expiryDate, @Param("interviewId") String interviewId);
+    int updatePassLetterInfo(@Param("passCode") String passCode, @Param("passPdfUrl") String passPdfUrl, @Param("passImageUrl") String passImageUrl, @Param("expiryDate") String expiryDate, @Param("interviewId") String interviewId);

    /**
     * 根据面试 id 查询面试信息
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java
@@ -4,6 +4,7 @@ import com.cool.store.dto.partner.PartnerInterviewInfoDTO;
 import com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO;
 import com.cool.store.entity.HyPartnerInterviewPlanDO;
 import com.cool.store.request.GetInterviewListReq;
+import com.cool.store.vo.EnterpriseUserBaseInfoVO;
 import com.cool.store.vo.interview.InterviewVO;
 import com.github.pagehelper.PageInfo;
 import org.apache.ibatis.annotations.Param;
@@ -88,6 +89,11 @@ public interface HyPartnerInterviewPlanMapper {
     */
    InterviewVO getInterviewInfo(String interviewId);

+    /**
+     * 查询用户基本信息
+     */
+    EnterpriseUserBaseInfoVO getEnterpriseUserBaseInfo(@Param("userId") String userId);
+
    /**
     * 根据条件字段查询面试安排信息
     * @param record
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java
@@ -51,4 +51,11 @@ public interface RegionMapper {
     * @return
     */
    List<RegionDO> getRegionBaseInfoList();
+
+    /**
+     * 获取区域信息
+     * @param regionId
+     * @return
+     */
+    RegionDO getRegionInfoByRegionId(@Param("regionId") String regionId);
 }
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml
@@ -224,4 +224,11 @@
    where partner_id = #{partnerId} and partner_line_id = #{partnerLineId}
  </select>

+  <select id="getLineIdByIdCard" resultType="java.lang.Long">
+    select
+    partner_line_id
+    from hy_partner_base_info
+    where id_card = #{idCard}
+  </select>
+
 </mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml
@@ -28,7 +28,7 @@
  </resultMap>

  <resultMap id="PartnerInterviewInfoVO" type="com.cool.store.vo.PartnerInterviewInfoVO">
-    <id column="interviewId" property="interviewId"/>
+    <id column="interviewId" property="interviewPlanId"/>
    <result column="partnerId" property="partnerId"/>
    <result column="interviewerId" property="interviewerId"/>
    <association property="partnerName" column="partnerId" select="queryPartnerName" javaType="string"/>
@@ -259,7 +259,7 @@

  <!-- 根据加盟商id查询面试信息 -->
  <select id="queryByPartnerId" resultMap="PartnerInterviewInfoVO">
-    SELECT t1.id interviewId, `status`, start_time, end_time, room_id, t1.partner_id partnerId, t1.interviewer interviewerId
+    SELECT t1.id interviewId, t1.id interview_id, t1.interview_plan_id, `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_plan_id = t2.id
      WHERE t1.partner_id = #{partnerId}
@@ -280,18 +280,14 @@
  <update id="updateInterviewStatus">
    UPDATE hy_partner_interview
      SET `status` = #{status}
-      WHERE id = #{interviewId}
+      WHERE interview_plan_id = #{interviewPlanId}
  </update>

  <!-- 修改面试实际开始时间 -->
  <update id="updateActualStartTime">
    UPDATE hy_partner_interview_plan
      SET actual_start_time = IF(actual_start_time IS NULL, #{dateTime}, actual_start_time)
-      WHERE id = (
-          SELECT interview_plan_id
-          FROM hy_partner_interview
-          WHERE id = #{interviewId}
-        )
+      WHERE id = #{interviewPlanId}
  </update>

  <!-- 修改面试官或加盟商入会时间 -->
@@ -305,32 +301,28 @@
          partner_enter_time = IF(partner_enter_time IS NULL, #{dateTime}, partner_enter_time)
        </if>
      </set>
-      WHERE id = 1
+      WHERE interview_plan_id = #{interviewPlanId}
  </update>

  <!-- 修改加盟商参会状态为参加 -->
  <update id="updateWhetherPartnerEnter">
    UPDATE hy_partner_interview_plan
      SET is_partner_interview = 1
-      WHERE id = (
-        SELECT interview_plan_id
-          FROM hy_partner_interview
-          WHERE id = #{interviewId}
-      )
+      WHERE id = #{interviewPlanId}
  </update>

  <!-- 根据会议 id 获取面试官 id -->
-  <select id="getInterviewerByInterviewId" resultMap="partnerEnterInterviewVO">
+  <select id="getInterviewerByInterviewPlanId" resultMap="partnerEnterInterviewVO">
    SELECT interviewer, interviewer interviewer_id, partner_id
      FROM hy_partner_interview
-      WHERE id = #{interviewId}
+      WHERE interview_plan_id = #{interviewPlanId}
  </select>

  <!-- 获取通知函详情 -->
  <select id="getPassLetterDetail" resultMap="passLetterDetail">
-    SELECT auth_code, pass_code, pass_file_url, expiry_date, partner_id
+    SELECT auth_code, pass_code, pass_pdf_url, pass_image_url, expiry_date, partner_id
      FROM hy_partner_interview
-      WHERE id = #{interviewId}
+      WHERE interview_plan_id = #{interviewPlanId}
  </select>
  <!-- 获取意向开店区域 -->
  <select id="getVerifyCity" resultType="string">
@@ -359,8 +351,11 @@
        <if test="passCode != null and passCode != ''">
          pass_code = #{passCode},
        </if>
-        <if test="passFileUrl != null and passFileUrl != ''">
-          pass_file_url = #{passFileUrl},
+        <if test="passPdfUrl != null and passPdfUrl != ''">
+          pass_pdf_url = #{passPdfUrl},
+        </if>
+        <if test="passImageUrl != null and passImageUrl != ''">
+          pass_image_url = #{passImageUrl},
        </if>
        <if test="expiryDate != null and expiryDate != ''">
          expiry_date = #{expiryDate}
--- 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,
@@ -336,4 +347,11 @@
    </where>

  </select>
+
+  <!-- 查询用户基本信息 -->
+  <select id="getEnterpriseUserBaseInfo" resultType="com.cool.store.vo.EnterpriseUserBaseInfoVO">
+    select name, mobile
+      from enterprise_user
+      where user_id = #{userId}
+  </select>
 </mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
@@ -13,10 +13,16 @@
    <result column="is_write_partner_know" jdbcType="TINYINT" property="isWritePartnerKnow" />
    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="shop_code" jdbcType="VARCHAR" property="shopCode" />
+    <result column="shop_name" jdbcType="VARCHAR" property="shopName" />
+    <result column="shop_id" jdbcType="VARCHAR" property="shopId" />
+    <result column="recommend_partner_id" jdbcType="VARCHAR" property="recommendPartnerId" />
+    <result column="recommend_partner_name" jdbcType="VARCHAR" property="recommendPartnerName" />
+    <result column="recommend_partner_mobile" jdbcType="VARCHAR" property="recommendPartnerMobile" />
  </resultMap>
  <sql id="Base_Column_List">
    id, partner_id, mobile, username, live_area, want_shop_area, accept_adjust_type, 
-    invite_code, is_write_partner_know, create_time, update_time
+    invite_code, is_write_partner_know, create_time, update_time, shop_code, shop_name, shop_id, recommend_partner_id, recommend_partner_name, recommend_partner_mobile
  </sql>
  <select id="selectByPartnerId" resultMap="BaseResultMap" >
    select
--- a/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml
@@ -187,4 +187,13 @@
        where
            deleted = 0
    </select>
+    
+    <select id="getRegionInfoByRegionId" resultMap="BaseResultMap">
+        select
+            <include refid="Base_Column_List"/>
+        from
+            region
+        where
+            deleted = 0 and region_id= #{regionId}
+    </select>
 </mapper>