From ac68c59ab4f290a660d202c381c345504cf7bef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E4=BC=8F=E4=BC=BD?= Date: Thu, 19 Oct 2023 17:33:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=84=8F=E5=90=91=E5=8C=BA=E5=9F=9Fid=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=88=90=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/HyPartnerLineInfoDAO.java | 4 ++-- .../com/cool/store/mapper/HyPartnerLineInfoMapper.java | 1 - .../com/cool/store/request/PrivateSeaLineListRequest.java | 3 --- .../store/service/impl/HyPartnerLineInfoServiceImpl.java | 8 ++++---- 4 files changed, 6 insertions(+), 10 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 9ddb6e6c1..b334b8542 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 @@ -137,10 +137,10 @@ public class HyPartnerLineInfoDAO { 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 intentAreaId,String intentAreaQueryType,String lineStartTime,String lineEndTime,String userChannelQueryType){ + ,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 - ,partnerName,partnerMobile,investmentManagerId,userPortraitQueryType,intentAreaId,intentAreaQueryType,lineStartTime,lineEndTime,userChannelQueryType); + ,partnerName,partnerMobile,investmentManagerId,userPortraitQueryType,intentAreaQueryType,lineStartTime,lineEndTime,userChannelQueryType); } 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 c53be3997..1f2453282 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 @@ -186,7 +186,6 @@ public interface HyPartnerLineInfoMapper { @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, 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 968019d1d..81b9e74f4 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 @@ -33,9 +33,6 @@ public class PrivateSeaLineListRequest extends PageInfoRequest { @ApiModelProperty("截止时间_结束") private String deadlineEnd; - @ApiModelProperty("意向区域") - private String intentArea; - @ApiModelProperty("调剂方式") private Integer acceptAdjustType; 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 9ce6c0c20..2520f62f5 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 @@ -625,13 +625,13 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { if (!allPrivateSeaFlag){ userIdsByScope = enterpriseUserService.getUserIdsByScope(userId); } - String intentAreaName = getIntentAreaName(request.getIntentArea()); + 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.getIntentAreaId(),request.getIntentAreaQueryType(),request.getLineStartTime(),request.getLineEndTime(),request.getUserChannelQueryType())); + 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())); List list = privateLineList.getList(); if (CollectionUtils.isEmpty(list)){ return privateLineList;