diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java index 8585eab56..fe3a33c4e 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java @@ -42,7 +42,7 @@ public class HyPartnerIntentInfoDAO { public List selectPartnerIntentApplyInfoList(String userId, String workflowStage, String workflowStatus, String keyword, Integer callStatus, - List userPortraitIdList, String lastFollowStartTime, String lastFollowEndTime, List userChannelIdList){ + List userPortraitIdList, String lastFollowStartTime, String lastFollowEndTime, List userChannelIdList){ if (StringUtils.isEmpty(userId)){ return new ArrayList<>(); } 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 262448e81..8d3d92380 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 @@ -138,9 +138,9 @@ public class HyPartnerLineInfoDAO { } public List getPrivateSeaLineList(String keyword, String keywordType, String workflowStage, String workflowStatus, String deadlineStart, String deadlineEnd, - String intentAreaName, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List userIdList,List developmentManagerList){ + String intentAreaName, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List userIdList,List developmentManagerList,List userPortraitIdList){ return hyPartnerLineInfoMapper.getPrivateSeaLineList( keyword, keywordType, workflowStage, workflowStatus, deadlineStart, deadlineEnd, - intentAreaName, acceptAdjustType, storeKeyword, storeKeywordType, userIdList,developmentManagerList); + intentAreaName, acceptAdjustType, storeKeyword, storeKeywordType, userIdList,developmentManagerList,userPortraitIdList); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java index f4fd4f339..da7c61c7a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java @@ -42,7 +42,7 @@ public interface HyPartnerIntentInfoMapper { @Param("workflowStatus") String workflowStatus, @Param("keyword") String keyword, @Param("callStatus") Integer callStatus, - @Param("userPortraitIdList") List userPortraitIdList, + @Param("userPortraitIdList") List userPortraitIdList, @Param("lastFollowStartTime") String lastFollowStartTime, @Param("lastFollowEndTime") String lastFollowEndTime, @Param("userChannelIdList") List userChannelIdList); 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 d55722ad1..6c7c4ef90 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 @@ -175,7 +175,8 @@ public interface HyPartnerLineInfoMapper { @Param("storeKeyword") String storeKeyword, @Param("storeKeywordType") String storeKeywordType, @Param("userIdList") List userIdList, - @Param("developmentManagerList") List developmentManagerList); + @Param("developmentManagerList") List developmentManagerList, + @Param("userPortraitIdList") List userPortraitIdList); /** diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 4167d77b8..e9b89e7bc 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -547,6 +547,11 @@ #{userId} + + + bi.user_portrait like concat("%,", #{userPortraitId}, ",%") + + #{developmentManager} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentApplyRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentApplyRequest.java index 4d99f9302..26cd35ac5 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentApplyRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentApplyRequest.java @@ -18,7 +18,7 @@ public class PartnerIntentApplyRequest { private String type; private String keyword; private Integer callStatus; - private List userPortraitIdList; + private List userPortraitIdList; private Long lastFollowStartTime; private Long lastFollowEndTime; private List userChannelIdList; 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 7322333b8..5955d599b 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 @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.List; /** * @Author suzhuhong @@ -45,5 +46,7 @@ public class PrivateSeaLineListRequest extends PageInfoRequest { @ApiModelProperty("【storeCode -推荐店铺编码】、【storeName 推荐店铺名称】、【partnerName 加盟商姓名】或【partnerMobile 手机号】") private String storeKeywordType; + private List userPortraitIdList; + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerIntentInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerIntentInfoService.java index ce2888e4f..ff439b7ad 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerIntentInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerIntentInfoService.java @@ -29,7 +29,7 @@ public interface HyPartnerIntentInfoService { * @return */ PageInfo getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber,String keyword, Integer callStatus, - List userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, List userChannelIdList); + List userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, List userChannelIdList); /** * 根据线索查询加盟商意向申请信息 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java index efe59875a..add396366 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java @@ -81,7 +81,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic @Override public PageInfo getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber,String keyword, Integer callStatus, - List userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, List userChannelIdList) { + List userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, List userChannelIdList) { String workflowStatus = ""; if (CommonConstants.PENDING.equals(type)) { workflowStatus = WorkflowStatusEnum.INTENT_1.getCode(); 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 0032d49a1..08bb41574 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 @@ -573,7 +573,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { 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.getStoreKeywordType(), userIdsByScope.getInvestmentUserIds(),userIdsByScope.getDevelopmentUserIds(),request.getUserPortraitIdList())); List list = privateLineList.getList(); if (CollectionUtils.isEmpty(list)){ return new PageInfo<>();