From 459436512c7484d3753642969f65f83bc4e0ae88 Mon Sep 17 00:00:00 2001
From: pserimal <fengli@hsayi.com>
Date: Mon, 19 Jun 2023 16:34:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E6=9E=90=E9=9D=A2=E8=AF=95?=
 =?UTF-8?q?=E8=BF=87=E7=A8=8B=E4=BF=A1=E6=81=AFprocessInfo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/store/vo/interview/InterviewVO.java  | 10 +++++++++-
 .../java/com/cool/store/service/InterviewService.java  |  4 ++--
 .../cool/store/service/impl/InterviewServiceImpl.java  |  4 ++++
 3 files changed, 15 insertions(+), 3 deletions(-)

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 2e6102b82..55c79cb9e 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
@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author: young.yu
  * @Date: 2023-06-08  16:26
@@ -22,6 +24,9 @@ public class InterviewVO {
     @ApiModelProperty("资质审核流程id")
     private String qualifyVerifyId;
 
+    @ApiModelProperty("意向合同编号")
+    private String intentionContractNo;
+
     @ApiModelProperty("审核通过时间")
     private String passTime;
 
@@ -76,7 +81,10 @@ public class InterviewVO {
     @ApiModelProperty(value = "预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝", required = true)
     private Integer status;
 
-    @ApiModelProperty(value = "面试过程信息", required = false)
+    @ApiModelProperty(value = "面试过程信息视频URL数组", required = true)
+    private List<String> processInfoList;
+
+    @ApiModelProperty(value = "面试过程信息未解析String", required = false)
     private String processInfo;
 
     @ApiModelProperty("授权码")
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java
index 062e418e2..2d387e950 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java
@@ -18,8 +18,8 @@ public interface InterviewService {
     List<InterviewVO> getInterviewList(GetInterviewListReq request);
 
     /**
-     * 根据面试会议id查询面试信息
-     * @param interviewId
+     * 根据面试会议计划id查询面试信息
+     * @param interviewPlanId
      * @return
      */
     InterviewVO getInterviewInfo(String interviewPlanId);
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
index 9566352a9..7e055b7d1 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
@@ -73,6 +73,10 @@ public class InterviewServiceImpl implements InterviewService {
     @Override
     public InterviewVO getInterviewInfo(String interviewPlanId) {
         InterviewVO vo = hyPartnerInterviewPlanMapper.getInterviewInfo(interviewPlanId);
+        //将 processInfo 解析为 List
+        List<String> split = Arrays.asList(vo.getProcessInfo().split(","));
+        vo.setProcessInfoList(split);
+        vo.setProcessInfo("");
         //查询面试官和记录人信息
         EnterpriseUserBaseInfoVO interviewerInfo = hyPartnerInterviewPlanMapper.getEnterpriseUserBaseInfo(vo.getInterviewerId());
         vo.setInterviewerName(interviewerInfo.getName());

From b76e3ec7548ce5ce7ab33f78fea408dade2f7ada 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: Mon, 19 Jun 2023 16:45:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=A7=81=E6=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cool/store/dao/HyPartnerLineInfoDAO.java  | 17 +++--
 .../store/mapper/HyPartnerLineInfoMapper.java | 24 ++++++-
 .../mapper/HyPartnerLineInfoMapper.xml        | 65 +++++++++++++++++
 .../store/dto/partner/PrivateSeaLineDTO.java  | 72 +++++++++++++++++++
 .../request/PrivateSeaLineListRequest.java    | 18 ++---
 .../cool/store/vo/PrivateSeaLineListVo.java   | 14 ++--
 .../service/HyPartnerLineInfoService.java     | 10 +++
 .../impl/HyPartnerLineInfoServiceImpl.java    | 55 ++++++++++++--
 8 files changed, 246 insertions(+), 29 deletions(-)
 create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PrivateSeaLineDTO.java

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java
index 270f9c160..2ba898a51 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java
@@ -6,11 +6,10 @@ import com.cool.store.dto.partner.StageCountDTO;
 import com.cool.store.dto.partner.*;
 import com.cool.store.entity.HyPartnerLineInfoDO;
 import com.cool.store.mapper.HyPartnerLineInfoMapper;
-import com.cool.store.vo.LineFollowHistoryVO;
-import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import javax.annotation.Resource;
@@ -91,9 +90,9 @@ public class HyPartnerLineInfoDAO {
         return hyPartnerLineInfoMapper.selectPartnerLineInfoAndBaseInfo(lineId);
     }
 
-    public PageInfo<HyPartnerLineInfoDO> lastMonthCloseLine(String userId, String lastMonthTodayDate){
+    public List<HyPartnerLineInfoDO> lastMonthCloseLine(String userId, String lastMonthTodayDate){
         if (userId==null){
-            return new PageInfo<>();
+            return new ArrayList<>();
         }
         return hyPartnerLineInfoMapper.lastMonthCloseLine(userId,lastMonthTodayDate);
     }
@@ -115,7 +114,7 @@ public class HyPartnerLineInfoDAO {
     }
 
 
-    public PageInfo<PartnerBlackListDTO> getBlackList( String userNameKeyword,String phoneKeyword, String intentArea , Integer acceptAdjustType){
+    public List<PartnerBlackListDTO> getBlackList( String userNameKeyword,String phoneKeyword, String intentArea , Integer acceptAdjustType){
         return hyPartnerLineInfoMapper.getBlackList(userNameKeyword,phoneKeyword,intentArea,acceptAdjustType);
     }
 
@@ -127,10 +126,16 @@ public class HyPartnerLineInfoDAO {
         return hyPartnerLineInfoMapper.joinAndRemoveBlack(lineId,status,joinReason,removeReason);
     }
 
-    public PageInfo<PublicSeaLineDTO> getPublicSeaLineList( String userNameKeyword, String phoneKeyword, String intentArea, Integer acceptAdjustType, Date updateStartTime, Date updateEndTime, List<String> userIdList){
+    public List<PublicSeaLineDTO> getPublicSeaLineList( String userNameKeyword, String phoneKeyword, String intentArea, Integer acceptAdjustType, Date updateStartTime, Date updateEndTime, List<String> userIdList){
         return  hyPartnerLineInfoMapper.getPublicSeaLineList(userNameKeyword,phoneKeyword,intentArea,acceptAdjustType,updateStartTime,updateEndTime,userIdList);
     }
 
+    public List<PrivateSeaLineDTO> getPrivateSeaLineList(String keyword, String keywordType, String workflowStage, String workflowStatus, Date deadlineStart, Date deadlineEnd,
+                                                        String intentArea, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List<String> userIdList){
+        return  hyPartnerLineInfoMapper.getPrivateSeaLineList( keyword,  keywordType,  workflowStage,  workflowStatus,  deadlineStart,  deadlineEnd,
+                 intentArea,  acceptAdjustType,  storeKeyword,  storeKeywordType, userIdList);
+    }
+
 
     public List<HyPartnerLineInfoDO> getPartnerLastLine(List<String> partnerIdList){
         if (CollectionUtils.isEmpty(partnerIdList)){
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java
index 2b5cf795b..155b370e8 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java
@@ -90,7 +90,7 @@ public interface HyPartnerLineInfoMapper {
      * @param lastMonthTodayDate
      * @return
      */
-    PageInfo<HyPartnerLineInfoDO>  lastMonthCloseLine(@Param("userId") String userId,
+    List<HyPartnerLineInfoDO>  lastMonthCloseLine(@Param("userId") String userId,
                                                       @Param("lastMonthTodayDate") String lastMonthTodayDate);
 
     /**
@@ -116,7 +116,7 @@ public interface HyPartnerLineInfoMapper {
      * @param acceptAdjustType
      * @return
      */
-    PageInfo<PartnerBlackListDTO> getBlackList(@Param("userNameKeyword") String userNameKeyword,
+    List<PartnerBlackListDTO> getBlackList(@Param("userNameKeyword") String userNameKeyword,
                                                @Param("phoneKeyword") String phoneKeyword,
                                                @Param("intentArea") String intentArea ,
                                                @Param("acceptAdjustType") Integer acceptAdjustType);
@@ -150,7 +150,7 @@ public interface HyPartnerLineInfoMapper {
      * @param userIdList
      * @return
      */
-    PageInfo<PublicSeaLineDTO> getPublicSeaLineList(@Param("userNameKeyword") String userNameKeyword,
+    List<PublicSeaLineDTO> getPublicSeaLineList(@Param("userNameKeyword") String userNameKeyword,
                                                     @Param("phoneKeyword") String phoneKeyword,
                                                     @Param("intentArea") String intentArea,
                                                     @Param("acceptAdjustType") Integer acceptAdjustType,
@@ -158,6 +158,24 @@ public interface HyPartnerLineInfoMapper {
                                                     @Param("updateEndTime") Date updateEndTime,
                                                     @Param("userIdList") List<String> userIdList);
 
+
+    /**
+     *
+     * @return
+     */
+    List<PrivateSeaLineDTO> getPrivateSeaLineList(@Param("keyword") String keyword,
+                                                  @Param("keywordType") String keywordType,
+                                                  @Param("workflowStage") String workflowStage,
+                                                  @Param("workflowStatus") String workflowStatus,
+                                                  @Param("deadlineStart") Date deadlineStart,
+                                                  @Param("deadlineEnd") Date deadlineEnd,
+                                                  @Param("intentArea") String intentArea,
+                                                  @Param("acceptAdjustType") Integer acceptAdjustType,
+                                                  @Param("storeKeyword") String storeKeyword,
+                                                  @Param("storeKeywordType") String storeKeywordType,
+                                                  @Param("userIdList") List<String> userIdList);
+
+
     /**
      * 查询对应的加盟商最近线索
      * @param partnerIdList
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index 239671482..cee13a969 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -432,6 +432,71 @@
   </select>
 
 
+  <select id="getPrivateSeaLineList" resultType="com.cool.store.dto.partner.PrivateSeaLineDTO">
+    SELECT
+      hpli.id  as lineId,
+      hpli.partner_id  as partnerId,
+      hpli.workflow_stage  as workflowStage,
+      hpli.workflow_status  as workflowStatus,
+      hpli.deadline  as deadline,
+      hpli.investment_manager  as investmentManager,
+      hpli.development_manager  as developmentManager,
+      hpli.line_status  as lineStatus,
+      hpli.update_time  as updateTime,
+      hpii.want_shop_area as wantShopArea,
+      hpii.accept_adjust_type as acceptAdjustType,
+      hpuinfo.username as partnerUserName,
+      hpuinfo.mobile as partnerUserPhone,
+      hpuinfo.shop_name as storeName,
+      hpuinfo.recommend_partner_name as recommendPartnerName,
+    eu.name as investmentManagerName
+    FROM
+    hy_partner_line_info hpli
+    LEFT JOIN hy_partner_intent_info hpii ON hpli.id = hpii.partner_line_id
+    LEFT JOIN hy_partner_user_info hpuinfo ON hpli.partner_id = hpuinfo.partner_id
+    LEFT JOIN enterprise_user eu ON hpli.investment_manager = eu.user_id
+    WHERE line_status in (1,2)
+    <if test="keywordType!=null and keywordType=='name'">
+      AND (eu.name  like concat('%',#{keyword},'%') or  hpuinfo.username  like concat('%',#{keyword},'%'))
+    </if>
+    <if test="keywordType!=null and keywordType=='mobile'">
+      AND ( eu.mobile  like concat('%',#{keyword},'%') or  hpuinfo.mobile   like concat('%',#{keyword},'%')')
+    </if>
+    <if test="workflowStage!=null and workflowStage!=''">
+      AND hpli.workflow_stage = #{workflowStage}
+    </if>
+    <if test="workflowStatus!=null and workflowStatus!=''">
+      AND hpli.workflow_status = #workflowStatus}
+    </if>
+    <if test="deadlineStart!=null and deadlineEnd!=null">
+      AND hpli.deadline BETWEEN #{deadlineStart} and #{deadlineStart}
+    </if>
+    <if test="intentArea!=null and intentArea!=''">
+      AND hpuinfo.want_shop_area = #{intentArea}
+    </if>
+    <if test="acceptAdjustType!=null">
+      AND hpuinfo.accept_adjust_type = #{acceptAdjustType}
+    </if>
+    <if test="storeKeywordType!=null and storeKeywordType==storeCode">
+      AND hpuinfo.shop_code  like concat('%',#{storeKeyword},'%')
+    </if>
+    <if test="storeKeywordType!=null and storeKeywordType==storeName">
+      AND hpuinfo.shop_name  like concat('%',#{storeKeyword},'%')
+    </if>
+    <if test="storeKeywordType!=null and storeKeywordType==partnerName">
+      AND hpuinfo.recommend_partner_name  like concat('%',#{storeKeyword},'%')
+    </if>
+    <if test="storeKeywordType!=null and storeKeywordType==partnerMobile">
+      AND hpuinfo.recommend_partner_mobile like concat('%',#{storeKeyword},'%')
+    </if>
+    <if test="userIdList!=null and userIdList.size>0">
+      <foreach collection="userIdList" item="userId" open="and a.investment_manager in (" close=")" separator=",">
+        #{userId}
+      </foreach>
+    </if>
+  </select>
+
+
   <select id="getPartnerLastLine" resultMap="BaseResultMap">
     SELECT
     <include refid="Base_Column_List"></include>
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PrivateSeaLineDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PrivateSeaLineDTO.java
new file mode 100644
index 000000000..cfd98e6a0
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PrivateSeaLineDTO.java
@@ -0,0 +1,72 @@
+package com.cool.store.dto.partner;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author suzhuhong
+ * @Date 2023/6/19 15:30
+ * @Version 1.0
+ */
+@Data
+public class PrivateSeaLineDTO {
+
+
+    @ApiModelProperty("线索ID")
+    private Long lineId;
+
+    @ApiModelProperty("加盟商用户ID")
+    private String partnerId;
+
+    @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同")
+    private String workflowStage;
+
+    @ApiModelProperty("流程子状态")
+    private String workflowStatus;
+
+    @ApiModelProperty("加盟商用户名称")
+    private String partnerUserName;
+
+    @ApiModelProperty("加盟商用户手机号")
+    private String partnerUserPhone;
+
+    @ApiModelProperty("截止时间")
+    private Date deadline;
+
+    @ApiModelProperty("招商经理")
+    private String investmentManager;
+
+    @ApiModelProperty("招商经理名称")
+    private String investmentManagerName;
+
+
+    @ApiModelProperty("开发经理")
+    private String developmentManager;
+
+    @ApiModelProperty("意向开店区域")
+    private String wantShopArea;
+
+    @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
+    private Integer acceptAdjustType;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("门店编码")
+    private String storeCode;
+
+    @ApiModelProperty("门店名称")
+    private String storeName;
+
+    @ApiModelProperty("线索状态")
+    private Integer lineStatus;
+
+    @ApiModelProperty("推荐加盟商ID")
+    private String recommendPartnerId;
+
+    @ApiModelProperty("推荐加盟商名称")
+    private String recommendPartnerName;
+
+}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java
index dceeee302..4ec755803 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java
@@ -1,5 +1,6 @@
 package com.cool.store.request;
 
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,16 +14,17 @@ import java.util.Date;
  */
 @Data
 @ApiModel
-public class PrivateSeaLineListRequest {
+public class PrivateSeaLineListRequest  extends PageInfoRequest {
 
+    @ApiModelProperty("【用户姓名】、【手机号】、【招商经理姓名】或【招商经理手机号】 搜索关键字")
+    private String keyword;
 
-    @ApiModelProperty("【用户姓名】、【手机号】、【招商经理姓名】或【招商经理手机号】")
-    private String keyWord;
+    @ApiModelProperty("name:表示用户姓名/招商经理姓名  mobile 用户手机号/招商经理手机号")
+    private String keywordType;
 
     @ApiModelProperty("一级下拉列表选择当前意向阶段")
     private String workflowStage;
 
-
     @ApiModelProperty("二级下拉列表可选项为当前一级下拉列表选中的意向阶段的状态")
     private String workflowStatus;
 
@@ -39,11 +41,9 @@ public class PrivateSeaLineListRequest {
     private Integer acceptAdjustType;
 
     @ApiModelProperty("【推荐店铺编码】、【推荐店铺名称】、【加盟商姓名】或【手机号】")
-    private String keyInfo;
-
-
-
-
+    private String storeKeyword;
+    @ApiModelProperty("【storeCode  -推荐店铺编码】、【storeName  推荐店铺名称】、【partnerName 加盟商姓名】或【partnerMobile  手机号】")
+    private String storeKeywordType;
 
 
 }
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java
index 3128e7d9f..16bc13373 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java
@@ -17,9 +17,9 @@ public class PrivateSeaLineListVo {
 
 
     @ApiModelProperty("线索ID")
-    private Long id;
+    private Long lineId;
 
-    @ApiModelProperty("hy_partner_user_info.partner_id")
+    @ApiModelProperty("加盟商用户ID")
     private String partnerId;
 
     @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同")
@@ -28,9 +28,6 @@ public class PrivateSeaLineListVo {
     @ApiModelProperty("流程子状态")
     private String workflowStatus;
 
-    @ApiModelProperty("加盟商用户ID")
-    private String partnerUserId;
-
     @ApiModelProperty("加盟商用户名称")
     private String partnerUserName;
 
@@ -43,12 +40,15 @@ public class PrivateSeaLineListVo {
     @ApiModelProperty("招商经理")
     private String investmentManager;
 
-    @ApiModelProperty("开发主管")
-    private String developmentDirector;
+    @ApiModelProperty("招商经理")
+    private String investmentManagerName;
 
     @ApiModelProperty("开发经理")
     private String developmentManager;
 
+    @ApiModelProperty("开发经理")
+    private String developmentManagerName;
+
     @ApiModelProperty("意向开店区域")
     private String wantShopArea;
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java
index e89522b4e..3845f564c 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java
@@ -2,6 +2,7 @@ package com.cool.store.service;
 
 import com.cool.store.request.CloseFollowRequest;
 import com.cool.store.request.LineRequest;
+import com.cool.store.request.PrivateSeaLineListRequest;
 import com.cool.store.vo.*;
 import com.github.pagehelper.PageInfo;
 
@@ -104,6 +105,15 @@ public interface HyPartnerLineInfoService {
      */
     PageInfo<PublicSeaLineListVo> publicSeaLineList(String userId,LineRequest lineRequest);
 
+
+    /**
+     * 私海列表
+     * @param userId
+     * @param privateSeaLineListRequest
+     * @return
+     */
+    PageInfo<PrivateSeaLineListVo> privateSeaLineList(String userId, PrivateSeaLineListRequest privateSeaLineListRequest) ;
+
     PartnerLineBaseInfoVO getPartnerLinBaseInfo(String partnerId);
 
     /**
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 f3f662f48..ae74e294f 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
@@ -19,6 +19,7 @@ import com.cool.store.enums.WorkflowStatusEnum;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.request.CloseFollowRequest;
 import com.cool.store.request.LineRequest;
+import com.cool.store.request.PrivateSeaLineListRequest;
 import com.cool.store.service.HyPartnerLineInfoService;
 import com.cool.store.utils.CoolDateUtils;
 import com.cool.store.utils.RedisUtilPool;
@@ -92,7 +93,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
     public PageInfo<PartnerLineInfoVO> lastMonthCloseLine(String userId, Integer pageSize, Integer pageNumber) {
         PageHelper.startPage(pageNumber,pageSize);
         String lastMonthTodayDate = DateUtil.format(CoolDateUtils.getDateBefore(new Date(),-30), CoolDateUtils.DATE_FORMAT_SEC);
-        PageInfo hyPartnerLineInfoDOPageInfo = hyPartnerLineInfoDAO.lastMonthCloseLine(userId, lastMonthTodayDate);
+        PageInfo hyPartnerLineInfoDOPageInfo = new PageInfo(hyPartnerLineInfoDAO.lastMonthCloseLine(userId, lastMonthTodayDate));
 
         List<HyPartnerLineInfoDO> list = hyPartnerLineInfoDOPageInfo.getList();
         List<PartnerLineInfoVO> result = new ArrayList<>();
@@ -150,7 +151,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
     @Override
     public PageInfo<BlackListVO> getBlackList(LineRequest LineRequest) {
         PageHelper.startPage(LineRequest.getPageNum(),LineRequest.getPageSize());
-        PageInfo blackListDTOPageInfo = hyPartnerLineInfoDAO.getBlackList(LineRequest.getUserNameKeyword(), LineRequest.getPhoneKeyword(),LineRequest.getIntentArea(), LineRequest.getAcceptAdjustType());
+        PageInfo blackListDTOPageInfo = new PageInfo(hyPartnerLineInfoDAO.getBlackList(LineRequest.getUserNameKeyword(), LineRequest.getPhoneKeyword(),LineRequest.getIntentArea(), LineRequest.getAcceptAdjustType()));
         List<PartnerBlackListDTO> list = blackListDTOPageInfo.getList();
         List<BlackListVO> result = new ArrayList<>();
         list.stream().forEach(x->{
@@ -256,8 +257,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
             userIds = Arrays.asList(userId);
         }
         PageHelper.startPage(lineRequest.getPageNum(),lineRequest.getPageSize());
-        PageInfo publicSeaLineList = hyPartnerLineInfoDAO.getPublicSeaLineList(lineRequest.getUserNameKeyword(), lineRequest.getPhoneKeyword(),
-                lineRequest.getIntentArea(), lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), userIds);
+        PageInfo publicSeaLineList = new PageInfo(hyPartnerLineInfoDAO.getPublicSeaLineList(lineRequest.getUserNameKeyword(), lineRequest.getPhoneKeyword(),
+                lineRequest.getIntentArea(), lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), userIds));
 
         List<PublicSeaLineDTO> list = publicSeaLineList.getList();
         if (CollectionUtils.isEmpty(list)){
@@ -302,6 +303,52 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         return publicSeaLineList;
     }
 
+    @Override
+    public PageInfo<PrivateSeaLineListVo> privateSeaLineList(String userId, PrivateSeaLineListRequest request) {
+        // TODO: 2023/6/19 su userlist计算
+        PageHelper.startPage(request.getPageNum(),request.getPageSize());
+        PageInfo privateLineList = new PageInfo(hyPartnerLineInfoDAO.getPrivateSeaLineList(request.getKeyword(),  request.getKeywordType(),  request.getWorkflowStage(),
+                request.getWorkflowStatus(),  request.getDeadlineStart(),  request.getDeadlineEnd(),
+                request.getIntentArea(),  request.getAcceptAdjustType(),  request.getStoreKeyword(),  request.getStoreKeywordType(), null));
+        List<PrivateSeaLineDTO> list = privateLineList.getList();
+        if (CollectionUtils.isEmpty(list)){
+            return new PageInfo<>();
+        }
+        Map<String, String> devManagerMap = new HashMap<>();
+        List<String> devManagerIdList = list.stream().filter(x -> StringUtils.isNotEmpty(x.getDevelopmentManager())).map(PrivateSeaLineDTO::getDevelopmentManager).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(devManagerIdList)){
+            List<EnterpriseUserDO> devManagerList = enterpriseUserDAO.getUserInfoByUserIds(devManagerIdList);
+            devManagerMap = devManagerList.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, EnterpriseUserDO::getName));
+        }
+        List<PrivateSeaLineListVo> result = new ArrayList<>();
+
+        Map<String, String> finalDevManagerMap = devManagerMap;
+        list.forEach(x->{
+            PrivateSeaLineListVo privateSeaLineListVo = new PrivateSeaLineListVo();
+            privateSeaLineListVo.setLineId(x.getLineId());
+            privateSeaLineListVo.setLineStatus(x.getLineStatus());
+            privateSeaLineListVo.setPartnerId(x.getPartnerId());
+            privateSeaLineListVo.setDeadline(x.getDeadline());
+            privateSeaLineListVo.setPartnerUserPhone(x.getPartnerUserPhone());
+            privateSeaLineListVo.setAcceptAdjustType(x.getAcceptAdjustType());
+            privateSeaLineListVo.setInvestmentManagerName(x.getInvestmentManager());
+            privateSeaLineListVo.setDevelopmentManager(x.getDevelopmentManager());
+            privateSeaLineListVo.setInvestmentManagerName(x.getInvestmentManagerName());
+            privateSeaLineListVo.setStoreCode(x.getStoreCode());
+            privateSeaLineListVo.setStoreName(x.getStoreName());
+            privateSeaLineListVo.setUpdateTime(x.getUpdateTime());
+            privateSeaLineListVo.setRecommendPartnerId(x.getRecommendPartnerId());
+            privateSeaLineListVo.setRecommendPartnerName(x.getRecommendPartnerName());
+            privateSeaLineListVo.setWorkflowStage(x.getWorkflowStage());
+            privateSeaLineListVo.setWantShopArea(x.getWantShopArea());
+            privateSeaLineListVo.setWorkflowStage(x.getWorkflowStage());
+            privateSeaLineListVo.setDevelopmentManagerName(finalDevManagerMap.get(x.getDevelopmentManager()));
+            result.add(privateSeaLineListVo);
+        });
+        privateLineList.setList(result);
+        return privateLineList;
+    }
+
     @Override
     public PartnerLineBaseInfoVO getPartnerLinBaseInfo(String partnerId) {
         PartnerLineBaseInfoVO lineBaseInfoVO = new PartnerLineBaseInfoVO();

From f5c58632e3810408f0cabf92dc1606828de1ce61 Mon Sep 17 00:00:00 2001
From: pserimal <fengli@hsayi.com>
Date: Mon, 19 Jun 2023 16:54:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E6=9E=90=E9=9D=A2=E8=AF=95?=
 =?UTF-8?q?=E8=BF=87=E7=A8=8B=E4=BF=A1=E6=81=AFprocessInfoList->vedioList?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/store/vo/interview/InterviewVO.java    | 2 +-
 .../cool/store/service/impl/InterviewServiceImpl.java    | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

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 55c79cb9e..0c1bbc152 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
@@ -82,7 +82,7 @@ public class InterviewVO {
     private Integer status;
 
     @ApiModelProperty(value = "面试过程信息视频URL数组", required = true)
-    private List<String> processInfoList;
+    private List<String> vedioList;
 
     @ApiModelProperty(value = "面试过程信息未解析String", required = false)
     private String processInfo;
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
index 7e055b7d1..6348b591d 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
@@ -33,6 +33,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -74,9 +75,11 @@ public class InterviewServiceImpl implements InterviewService {
     public InterviewVO getInterviewInfo(String interviewPlanId) {
         InterviewVO vo = hyPartnerInterviewPlanMapper.getInterviewInfo(interviewPlanId);
         //将 processInfo 解析为 List
-        List<String> split = Arrays.asList(vo.getProcessInfo().split(","));
-        vo.setProcessInfoList(split);
-        vo.setProcessInfo("");
+        if (!StringUtils.isEmpty(vo.getProcessInfo())) {
+            List<String> split = Arrays.asList(vo.getProcessInfo().split(","));
+            vo.setVedioList(split);
+            vo.setProcessInfo("");
+        }
         //查询面试官和记录人信息
         EnterpriseUserBaseInfoVO interviewerInfo = hyPartnerInterviewPlanMapper.getEnterpriseUserBaseInfo(vo.getInterviewerId());
         vo.setInterviewerName(interviewerInfo.getName());