用户私海查询调整

coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java

@@ -2,16 +2,12 @@ package com.cool.store.dao;
 
 import cn.hutool.core.map.MapUtil;
 import com.cool.store.constants.CommonConstants;
-import com.cool.store.dto.partner.PartnerBlackListDTO;
-import com.cool.store.dto.partner.PartnerLineInfoAndBaseInfoDTO;
-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.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
-import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
 
@@ -139,9 +135,12 @@ public class HyPartnerLineInfoDAO {
 
     public List<PrivateSeaLineDTO> getPrivateSeaLineList(String keyword, String keywordType, String workflowStage, String workflowStatus, String deadlineStart, String deadlineEnd,
                                                         String intentAreaName, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List<String> userIdList,
-                                                         List<String> developmentManagerList,List<Long> userPortraitIdList,List<Long> userChannelIdList, String updateStartTime, String updateEndTime){
+                                                         List<String> developmentManagerList,List<Long> userPortraitIdList,List<Long> userChannelIdList, String updateStartTime, String updateEndTime
+                                                        ,String partnerName,String partnerMobile,String investmentManagerId,String userPortraitQueryType
+                                                        ,String intentAreaId,String intentAreaQueryType,String lineStartTime,String lineEndTime,String userChannelQueryType){
         return  hyPartnerLineInfoMapper.getPrivateSeaLineList( keyword,  keywordType,  workflowStage,  workflowStatus,  deadlineStart,  deadlineEnd,
-                intentAreaName,  acceptAdjustType,  storeKeyword,  storeKeywordType, userIdList,developmentManagerList,userPortraitIdList,userChannelIdList, updateStartTime, updateEndTime);
+                intentAreaName,  acceptAdjustType,  storeKeyword,  storeKeywordType, userIdList,developmentManagerList,userPortraitIdList,userChannelIdList, updateStartTime, updateEndTime
+                ,partnerName,partnerMobile,investmentManagerId,userPortraitQueryType,intentAreaId,intentAreaQueryType,lineStartTime,lineEndTime,userChannelQueryType);
     }
 
 

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java

@@ -181,7 +181,16 @@ public interface HyPartnerLineInfoMapper {
                                                   @Param("userPortraitIdList") List<Long> userPortraitIdList,
                                                   @Param("userChannelIdList") List<Long> userChannelIdList,
                                                   @Param("updateStartTime") String updateStartTime,
-                                                  @Param("updateEndTime") String updateEndTime);
+                                                  @Param("updateEndTime") String updateEndTime,
+                                                  @Param("partnerName") String partnerName,
+                                                  @Param("partnerMobile") String partnerMobile,
+                                                  @Param("investmentManagerId") String investmentManagerId,
+                                                  @Param("userPortraitQueryType") String userPortraitQueryType,
+                                                  @Param("intentAreaId") String intentAreaId,
+                                                  @Param("intentAreaQueryType") String intentAreaQueryType,
+                                                  @Param("lineStartTime") String lineStartTime,
+                                                  @Param("lineEndTime") String lineEndTime,
+                                                  @Param("userChannelQueryType") String userChannelQueryType);
 
 
     /**

coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java

@@ -39,6 +39,21 @@ public class PrivateSeaLineListRequest  extends PageInfoRequest {
     @ApiModelProperty("调剂方式")
     private Integer acceptAdjustType;
 
+    @ApiModelProperty("加盟商姓名")
+    private String partnerName;
+
+    @ApiModelProperty("加盟商手机号")
+    private String partnerMobile;
+
+    @ApiModelProperty("招商经理ID")
+    private String investmentManagerId;
+
+    @ApiModelProperty("意向区域（type为空的时候不需要传值）")
+    private String intentAreaId;
+
+    @ApiModelProperty("意向区域 包含-contains/不包含-notContains/为空-blank")
+    private String intentAreaQueryType;
+
     @ApiModelProperty("【推荐店铺编码】、【推荐店铺名称】、【加盟商姓名】或【手机号】")
     private String storeKeyword;
     @ApiModelProperty("【storeCode  -推荐店铺编码】、【storeName  推荐店铺名称】、【partnerName 加盟商姓名】或【partnerMobile  手机号】")
@@ -47,41 +62,26 @@ public class PrivateSeaLineListRequest  extends PageInfoRequest {
     @ApiModelProperty("用户画像ID列表(type为空的时候不需要传值)")
     private List<Long> userPortraitIdList;
 
+    @ApiModelProperty("用户画像 包含-contains/不包含-notContains/为空-blank")
+    private String userPortraitQueryType;
+
     @ApiModelProperty("线索来源ID列表(type为空的时候不需要传值)")
     private List<Long> userChannelIdList;
 
+    @ApiModelProperty("线索来源 包含-contains/不包含-notContains/为空-blank")
+    private String userChannelQueryType;
+
     @ApiModelProperty("更新开始时间")
     private String updateStartTime;
 
     @ApiModelProperty("更新结束时间")
     private String updateEndTime;
 
-    @ApiModelProperty("线索姓名")
-    private String partnerName;
-
-    @ApiModelProperty("线索手机号")
-    private String partnerMobile;
-
-    @ApiModelProperty("招商经理ID")
-    private String investmentManagerId;
-
-    @ApiModelProperty("包含-contains/不包含-notContains/为空-blank")
-    private String userPortraitQueryType;
-
-    @ApiModelProperty("意向开店区域（type为空的时候不需要传值）")
-    private String intentAreaId;
-
-    @ApiModelProperty("包含-contains/不包含-notContains/为空-blank")
-    private String intentAreaQueryType;
-
     @ApiModelProperty("创建时间_开始")
     private String lineStartTime;
 
     @ApiModelProperty("创建时间_结束")
     private String lineEndTime;
 
-    @ApiModelProperty("包含-contains/不包含-notContains/为空-blank")
-    private String userChannelQueryType;
-
 
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java

@@ -2,7 +2,6 @@ package com.cool.store.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.constants.RedisConstant;
@@ -630,7 +629,9 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         PageHelper.startPage(request.getPageNum(),request.getPageSize());
         PageInfo privateLineList = new PageInfo(hyPartnerLineInfoDAO.getPrivateSeaLineList(request.getKeyword(),  request.getKeywordType(),  request.getWorkflowStage(),
                 request.getWorkflowStatus(),  request.getDeadlineStart(),  request.getDeadlineEnd(), intentAreaName,  request.getAcceptAdjustType(),  request.getStoreKeyword(),
-                request.getStoreKeywordType(), userIdsByScope.getInvestmentUserIds(),userIdsByScope.getDevelopmentUserIds(),request.getUserPortraitIdList(),request.getUserChannelIdList(), request.getUpdateStartTime(), request.getUpdateEndTime()));
+                request.getStoreKeywordType(), userIdsByScope.getInvestmentUserIds(),userIdsByScope.getDevelopmentUserIds(),request.getUserPortraitIdList(),request.getUserChannelIdList(), request.getUpdateStartTime(), request.getUpdateEndTime(),
+                request.getPartnerName(),request.getPartnerMobile(),request.getInvestmentManagerId(),request.getUserPortraitQueryType()
+                ,request.getIntentAreaId(),request.getIntentAreaQueryType(),request.getLineStartTime(),request.getLineEndTime(),request.getUserChannelQueryType()));
         List<PrivateSeaLineDTO> list = privateLineList.getList();
         if (CollectionUtils.isEmpty(list)){
             return privateLineList;