From ea26167907e8db6fe89c6d3a298c9c3e77f23e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 18 Dec 2023 16:05:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=81=E6=B5=B7=E5=88=97=E8=A1=A8=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E8=BF=87=E5=A4=9A=20=E4=BC=98=E5=8C=96=E5=85=A5?= =?UTF-8?q?=E5=8F=82=E4=B8=BA=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/dao/HyPartnerLineInfoDAO.java | 21 ++----- .../store/mapper/HyPartnerLineInfoMapper.java | 58 +------------------ .../request/PrivateSeaLineListRequest.java | 12 ++++ .../impl/HyPartnerLineInfoServiceImpl.java | 28 +++++---- 4 files changed, 38 insertions(+), 81 deletions(-) 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 1946f9e4b..9494a7181 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 @@ -5,6 +5,7 @@ import com.cool.store.constants.CommonConstants; import com.cool.store.dto.partner.*; import com.cool.store.entity.HyPartnerLineInfoDO; import com.cool.store.mapper.HyPartnerLineInfoMapper; +import com.cool.store.request.PrivateSeaLineListRequest; import com.cool.store.vo.LinePageInfoVo; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; @@ -135,14 +136,8 @@ public class HyPartnerLineInfoDAO { return hyPartnerLineInfoMapper.getPublicSeaLineList(userNameKeyword,phoneKeyword,intentAreaName,acceptAdjustType,updateStartTime,updateEndTime,userIdList, createStartTime, createEndTime); } - 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,List userPortraitIdList,List userChannelIdList, String updateStartTime, String updateEndTime - ,String partnerName,String partnerMobile,String investmentManagerId,String userPortraitQueryType - ,String intentAreaQueryType,String lineStartTime,String lineEndTime,String userChannelQueryType,String sortField,String sortOrder){ - return hyPartnerLineInfoMapper.getPrivateSeaLineList( keyword, keywordType, workflowStage, workflowStatus, deadlineStart, deadlineEnd, - intentAreaName, acceptAdjustType, storeKeyword, storeKeywordType, userIdList,developmentManagerList,userPortraitIdList,userChannelIdList, updateStartTime, updateEndTime - ,partnerName,partnerMobile,investmentManagerId,userPortraitQueryType,intentAreaQueryType,lineStartTime,lineEndTime,userChannelQueryType,sortField,sortOrder); + public List getPrivateSeaLineList(PrivateSeaLineListRequest request){ + return hyPartnerLineInfoMapper.getPrivateSeaLineList(request); } @@ -217,14 +212,8 @@ public class HyPartnerLineInfoDAO { return hyPartnerLineInfoMapper.getPublicSeaPageInfoNext(lineId,userNameKeyword,phoneKeyword,intentAreaName,acceptAdjustType,updateStartTime,updateEndTime,userIdList, createStartTime, createEndTime,pageTurn,limit1,limit2); } - public List getPrivateSeaPageInfoNext(Long lineId,String keyword, String keywordType, String workflowStage, String workflowStatus, String deadlineStart, String deadlineEnd, - String intentAreaName, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List userIdList, - List developmentManagerList,List userPortraitIdList,List userChannelIdList, String updateStartTime, String updateEndTime - ,String partnerName,String partnerMobile,String investmentManagerId,String userPortraitQueryType - ,String intentAreaQueryType,String lineStartTime,String lineEndTime,String userChannelQueryType,String sortField,String sortOrder,Integer limit1,Integer limit2){ - return hyPartnerLineInfoMapper.getPrivateSeaPageInfoNext(lineId,keyword, keywordType, workflowStage, workflowStatus, deadlineStart, deadlineEnd, - intentAreaName, acceptAdjustType, storeKeyword, storeKeywordType, userIdList,developmentManagerList,userPortraitIdList,userChannelIdList, updateStartTime, updateEndTime - ,partnerName,partnerMobile,investmentManagerId,userPortraitQueryType,intentAreaQueryType,lineStartTime,lineEndTime,userChannelQueryType,sortField,sortOrder,limit1,limit2); + public List getPrivateSeaPageInfoNext(PrivateSeaLineListRequest request){ + return hyPartnerLineInfoMapper.getPrivateSeaPageInfoNext(request); } 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 19e19a9c1..ea5177c4c 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 @@ -5,6 +5,7 @@ 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.entity.HyPartnerLineInfoDO; +import com.cool.store.request.PrivateSeaLineListRequest; import com.cool.store.vo.LinePageInfoVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -169,32 +170,7 @@ public interface HyPartnerLineInfoMapper { * * @return */ - List getPrivateSeaLineList(@Param("keyword") String keyword, - @Param("keywordType") String keywordType, - @Param("workflowStage") String workflowStage, - @Param("workflowStatus") String workflowStatus, - @Param("deadlineStart") String deadlineStart, - @Param("deadlineEnd") String deadlineEnd, - @Param("intentAreaName") String intentAreaName, - @Param("acceptAdjustType") Integer acceptAdjustType, - @Param("storeKeyword") String storeKeyword, - @Param("storeKeywordType") String storeKeywordType, - @Param("userIdList") List userIdList, - @Param("developmentManagerList") List developmentManagerList, - @Param("userPortraitIdList") List userPortraitIdList, - @Param("userChannelIdList") List userChannelIdList, - @Param("updateStartTime") String updateStartTime, - @Param("updateEndTime") String updateEndTime, - @Param("partnerName") String partnerName, - @Param("partnerMobile") String partnerMobile, - @Param("investmentManagerId") String investmentManagerId, - @Param("userPortraitQueryType") String userPortraitQueryType, - @Param("intentAreaQueryType") String intentAreaQueryType, - @Param("lineStartTime") String lineStartTime, - @Param("lineEndTime") String lineEndTime, - @Param("userChannelQueryType") String userChannelQueryType, - @Param("sortField") String sortField, - @Param("sortOrder") String sortOrder); + List getPrivateSeaLineList(PrivateSeaLineListRequest request); /** @@ -273,35 +249,7 @@ public interface HyPartnerLineInfoMapper { * * @return */ - List getPrivateSeaPageInfoNext(@Param("lineId") Long lineId,@Param("keyword") String keyword, - @Param("keywordType") String keywordType, - @Param("workflowStage") String workflowStage, - @Param("workflowStatus") String workflowStatus, - @Param("deadlineStart") String deadlineStart, - @Param("deadlineEnd") String deadlineEnd, - @Param("intentAreaName") String intentAreaName, - @Param("acceptAdjustType") Integer acceptAdjustType, - @Param("storeKeyword") String storeKeyword, - @Param("storeKeywordType") String storeKeywordType, - @Param("userIdList") List userIdList, - @Param("developmentManagerList") List developmentManagerList, - @Param("userPortraitIdList") List userPortraitIdList, - @Param("userChannelIdList") List userChannelIdList, - @Param("updateStartTime") String updateStartTime, - @Param("updateEndTime") String updateEndTime, - @Param("partnerName") String partnerName, - @Param("partnerMobile") String partnerMobile, - @Param("investmentManagerId") String investmentManagerId, - @Param("userPortraitQueryType") String userPortraitQueryType, - @Param("intentAreaQueryType") String intentAreaQueryType, - @Param("lineStartTime") String lineStartTime, - @Param("lineEndTime") String lineEndTime, - @Param("userChannelQueryType") String userChannelQueryType, - @Param("sortField") String sortField, - @Param("sortOrder") String sortOrder, - @Param("limit1") Integer limit1, - @Param("limit2") Integer limit2 - ); + List getPrivateSeaPageInfoNext(PrivateSeaLineListRequest request); List getPublicSeaPageInfoNext(@Param("lineId") Long lineId,@Param("userNameKeyword") String userNameKeyword, @Param("phoneKeyword") String phoneKeyword, 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 e335ad6f9..1e5930d82 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 @@ -106,5 +106,17 @@ public class PrivateSeaLineListRequest extends PageInfoRequest { @ApiModelProperty("排序顺序") private String pageTurn; + @ApiModelProperty("招商经理用户ids") + private List userIdList; + + @ApiModelProperty("开发经理用户ids") + private List developmentManagerList; + + private String intentAreaName; + + private Integer limit1; + + private Integer limit2; + } 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 0f0f049ba..33b9f6a0b 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 @@ -658,11 +658,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { } String intentAreaName = getIntentAreaName(request.getIntentAreaId()); 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.getPartnerName(),request.getPartnerMobile(),request.getInvestmentManagerId(),request.getUserPortraitQueryType() - ,request.getIntentAreaQueryType(),request.getLineStartTime(),request.getLineEndTime(),request.getUserChannelQueryType(),request.getSortField(),request.getSortOrder())); + handleReq(request, intentAreaName,userIdsByScope); + PageInfo privateLineList = new PageInfo(hyPartnerLineInfoDAO.getPrivateSeaLineList(request)); List list = privateLineList.getList(); if (CollectionUtils.isEmpty(list)){ return privateLineList; @@ -1016,11 +1013,11 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { String intentAreaName = getIntentAreaName(request.getIntentAreaId()); Integer pageNum = request.getPageNum(); Integer pageSize = request.getPageSize(); - List linePageInfoVo = hyPartnerLineInfoDAO.getPrivateSeaPageInfoNext(request.getLineId(), 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.getPartnerName(), request.getPartnerMobile(), request.getInvestmentManagerId(), request.getUserPortraitQueryType() - , request.getIntentAreaQueryType(), request.getLineStartTime(), request.getLineEndTime(), request.getUserChannelQueryType(), request.getSortField(), request.getSortOrder(), (pageNum - 1) * pageSize == 0 ? 0 : (pageNum - 1) * pageSize - 1, pageSize + 2); + handleReq(request, intentAreaName,userIdsByScope); + int limit1 = (pageNum - 1) * pageSize == 0 ? 0 : (pageNum - 1) * pageSize - 1; + request.setLimit1(limit1); + request.setLimit2(pageSize + 2); + List linePageInfoVo = hyPartnerLineInfoDAO.getPrivateSeaPageInfoNext(request); Optional first = Stream.iterate(0, i -> i + 1).limit(linePageInfoVo.size()).filter(item -> request.getLineId().equals(linePageInfoVo.get(item).getLineId())).findFirst(); if (!first.isPresent()) { return null; @@ -1036,6 +1033,17 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { return null; } + /** + * 处理请求参数 + * @param request + * @param intentAreaName + * @param userIdsByScope + */ + private void handleReq(PrivateSeaLineListRequest request,String intentAreaName,UserPositionAndUserScopeDTO userIdsByScope){ + request.setIntentAreaName(intentAreaName); + request.setDevelopmentManagerList(userIdsByScope.getDevelopmentUserIds()); + request.setUserIdList(userIdsByScope.getInvestmentUserIds()); + } @Override public LinePageInfoVo publicSeaPageDetailNext(String userId, LineRequest lineRequest) {