suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

222

Browse Source
This commit is contained in:
苏竹红
2023-06-29 19:43:48 +08:00
parent 21ebf130f6
commit 62792cc63e
4 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,8 +114,8 @@ public class HyPartnerLineInfoDAO {
} }
public List<PartnerBlackListDTO> getBlackList( String userNameKeyword,String phoneKeyword, String intentArea , Integer acceptAdjustType){ public List<PartnerBlackListDTO> getBlackList( String userNameKeyword,String phoneKeyword, String intentAreaName , Integer acceptAdjustType){
return hyPartnerLineInfoMapper.getBlackList(userNameKeyword,phoneKeyword,intentArea,acceptAdjustType); return hyPartnerLineInfoMapper.getBlackList(userNameKeyword,phoneKeyword,intentAreaName,acceptAdjustType);
} }
@@ -126,14 +126,14 @@ public class HyPartnerLineInfoDAO {
return hyPartnerLineInfoMapper.joinAndRemoveBlack(lineId,status,joinReason,removeReason); return hyPartnerLineInfoMapper.joinAndRemoveBlack(lineId,status,joinReason,removeReason);
} }
public List<PublicSeaLineDTO> getPublicSeaLineList( String userNameKeyword, String phoneKeyword, String intentArea, Integer acceptAdjustType, String updateStartTime, String updateEndTime, List<String> userIdList){ public List<PublicSeaLineDTO> getPublicSeaLineList( String userNameKeyword, String phoneKeyword, String intentAreaName, Integer acceptAdjustType, String updateStartTime, String updateEndTime, List<String> userIdList){
return hyPartnerLineInfoMapper.getPublicSeaLineList(userNameKeyword,phoneKeyword,intentArea,acceptAdjustType,updateStartTime,updateEndTime,userIdList); return hyPartnerLineInfoMapper.getPublicSeaLineList(userNameKeyword,phoneKeyword,intentAreaName,acceptAdjustType,updateStartTime,updateEndTime,userIdList);
} }
public List<PrivateSeaLineDTO> getPrivateSeaLineList(String keyword, String keywordType, String workflowStage, String workflowStatus, Date deadlineStart, Date deadlineEnd, 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,List<String> developmentManagerList){ String intentAreaName, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List<String> userIdList,List<String> developmentManagerList){
return hyPartnerLineInfoMapper.getPrivateSeaLineList( keyword, keywordType, workflowStage, workflowStatus, deadlineStart, deadlineEnd, return hyPartnerLineInfoMapper.getPrivateSeaLineList( keyword, keywordType, workflowStage, workflowStatus, deadlineStart, deadlineEnd,
intentArea, acceptAdjustType, storeKeyword, storeKeywordType, userIdList,developmentManagerList); intentAreaName, acceptAdjustType, storeKeyword, storeKeywordType, userIdList,developmentManagerList);
} }

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

@@ -118,7 +118,7 @@ public interface HyPartnerLineInfoMapper {
*/ */
List<PartnerBlackListDTO> getBlackList(@Param("userNameKeyword") String userNameKeyword, List<PartnerBlackListDTO> getBlackList(@Param("userNameKeyword") String userNameKeyword,
@Param("phoneKeyword") String phoneKeyword, @Param("phoneKeyword") String phoneKeyword,
@Param("intentArea") String intentArea , @Param("intentAreaName") String intentAreaName ,
@Param("acceptAdjustType") Integer acceptAdjustType); @Param("acceptAdjustType") Integer acceptAdjustType);
@@ -152,7 +152,7 @@ public interface HyPartnerLineInfoMapper {
*/ */
List<PublicSeaLineDTO> getPublicSeaLineList(@Param("userNameKeyword") String userNameKeyword, List<PublicSeaLineDTO> getPublicSeaLineList(@Param("userNameKeyword") String userNameKeyword,
@Param("phoneKeyword") String phoneKeyword, @Param("phoneKeyword") String phoneKeyword,
@Param("intentArea") String intentArea, @Param("intentAreaName") String intentAreaName,
@Param("acceptAdjustType") Integer acceptAdjustType, @Param("acceptAdjustType") Integer acceptAdjustType,
@Param("updateStartTime") String updateStartTime, @Param("updateStartTime") String updateStartTime,
@Param("updateEndTime") String updateEndTime, @Param("updateEndTime") String updateEndTime,
@@ -169,7 +169,7 @@ public interface HyPartnerLineInfoMapper {
@Param("workflowStatus") String workflowStatus, @Param("workflowStatus") String workflowStatus,
@Param("deadlineStart") Date deadlineStart, @Param("deadlineStart") Date deadlineStart,
@Param("deadlineEnd") Date deadlineEnd, @Param("deadlineEnd") Date deadlineEnd,
@Param("intentArea") String intentArea, @Param("intentAreaName") String intentAreaName,
@Param("acceptAdjustType") Integer acceptAdjustType, @Param("acceptAdjustType") Integer acceptAdjustType,
@Param("storeKeyword") String storeKeyword, @Param("storeKeyword") String storeKeyword,
@Param("storeKeywordType") String storeKeywordType, @Param("storeKeywordType") String storeKeywordType,

12
coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
View File

@@ -388,8 +388,8 @@
<if test="phoneKeyword!=null and phoneKeyword !=''"> <if test="phoneKeyword!=null and phoneKeyword !=''">
and b.mobile like concat('%', #{phoneKeyword}, '%') and b.mobile like concat('%', #{phoneKeyword}, '%')
</if> </if>
<if test="intentArea!=null and intentArea!=''"> <if test="intentAreaName!=null and intentAreaName!=''">
and b.want_shop_area = #{intentArea} and b.want_shop_area like concat('%/',#{intentAreaName},'/%')
</if> </if>
<if test="acceptAdjustType!=null"> <if test="acceptAdjustType!=null">
and b.accept_adjust_type =#{acceptAdjustType} and b.accept_adjust_type =#{acceptAdjustType}
@@ -437,8 +437,8 @@
<if test="phoneKeyword!=null and phoneKeyword!=''"> <if test="phoneKeyword!=null and phoneKeyword!=''">
and b.mobile like concat('%',#{phoneKeyword},'%') and b.mobile like concat('%',#{phoneKeyword},'%')
</if> </if>
<if test="intentArea!=null and intentArea!=''"> <if test="intentAreaName!=null and intentAreaName!=''">
and b.want_shop_area = #{intentArea} and b.want_shop_area like concat('%/',#{intentAreaName},'/%')
</if> </if>
<if test="acceptAdjustType!=null"> <if test="acceptAdjustType!=null">
and b.accept_adjust_type = #{acceptAdjustType} and b.accept_adjust_type = #{acceptAdjustType}
@@ -498,8 +498,8 @@
<if test="deadlineStart!=null and deadlineEnd!=null"> <if test="deadlineStart!=null and deadlineEnd!=null">
AND hpli.deadline BETWEEN #{deadlineStart} and #{deadlineStart} AND hpli.deadline BETWEEN #{deadlineStart} and #{deadlineStart}
</if> </if>
<if test="intentArea!=null and intentArea!=''"> <if test="intentAreaName!=null and intentAreaName!=''">
AND hpuinfo.want_shop_area = #{intentArea} and b.want_shop_area like concat('%/',#{intentAreaName},'/%')
</if> </if>
<if test="acceptAdjustType!=null"> <if test="acceptAdjustType!=null">
AND hpuinfo.accept_adjust_type = #{acceptAdjustType} AND hpuinfo.accept_adjust_type = #{acceptAdjustType}

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

@@ -224,8 +224,9 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
@Override @Override
public PageInfo<BlackListVO> getBlackList(LineRequest LineRequest) { public PageInfo<BlackListVO> getBlackList(LineRequest LineRequest) {
String intentAreaName = getIntentAreaName(LineRequest.getIntentArea());
PageHelper.startPage(LineRequest.getPageNum(),LineRequest.getPageSize()); PageHelper.startPage(LineRequest.getPageNum(),LineRequest.getPageSize());
PageInfo blackListDTOPageInfo = new PageInfo(hyPartnerLineInfoDAO.getBlackList(LineRequest.getUserNameKeyword(), LineRequest.getPhoneKeyword(),LineRequest.getIntentArea(), LineRequest.getAcceptAdjustType())); PageInfo blackListDTOPageInfo = new PageInfo(hyPartnerLineInfoDAO.getBlackList(LineRequest.getUserNameKeyword(), LineRequest.getPhoneKeyword(),intentAreaName, LineRequest.getAcceptAdjustType()));
List<PartnerBlackListDTO> list = blackListDTOPageInfo.getList(); List<PartnerBlackListDTO> list = blackListDTOPageInfo.getList();
List<String> closeUserIdList = list.stream().map(PartnerBlackListDTO::getCloseUserId).collect(Collectors.toList()); List<String> closeUserIdList = list.stream().map(PartnerBlackListDTO::getCloseUserId).collect(Collectors.toList());
Map<String, String> userPhoneMap = enterpriseUserDAO.getUserNameAndMobile(closeUserIdList); Map<String, String> userPhoneMap = enterpriseUserDAO.getUserNameAndMobile(closeUserIdList);
@@ -417,9 +418,10 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
// }else { // }else {
// userIds = Arrays.asList(userId); // userIds = Arrays.asList(userId);
// } // }
String intentAreaName = getIntentAreaName(lineRequest.getIntentArea());
PageHelper.startPage(lineRequest.getPageNum(),lineRequest.getPageSize()); PageHelper.startPage(lineRequest.getPageNum(),lineRequest.getPageSize());
PageInfo publicSeaLineList = new PageInfo(hyPartnerLineInfoDAO.getPublicSeaLineList(lineRequest.getUserNameKeyword(), lineRequest.getPhoneKeyword(), PageInfo publicSeaLineList = new PageInfo(hyPartnerLineInfoDAO.getPublicSeaLineList(lineRequest.getUserNameKeyword(), lineRequest.getPhoneKeyword(),
lineRequest.getIntentArea(), lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), null)); intentAreaName, lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), null));
List<PublicSeaLineDTO> list = publicSeaLineList.getList(); List<PublicSeaLineDTO> list = publicSeaLineList.getList();
if (CollectionUtils.isEmpty(list)){ if (CollectionUtils.isEmpty(list)){
@@ -468,13 +470,15 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
@Override @Override
public PageInfo<PrivateSeaLineListVo> privateSeaLineList(String userId, PrivateSeaLineListRequest request) { public PageInfo<PrivateSeaLineListVo> privateSeaLineList(String userId, PrivateSeaLineListRequest request) {
UserPositionAndUserScopeDTO userIdsByScope = enterpriseUserService.getUserIdsByScope(userId); UserPositionAndUserScopeDTO userIdsByScope = enterpriseUserService.getUserIdsByScope(userId);
String intentAreaName = getIntentAreaName(request.getIntentArea());
PageHelper.startPage(request.getPageNum(),request.getPageSize()); PageHelper.startPage(request.getPageNum(),request.getPageSize());
PageInfo privateLineList = new PageInfo(hyPartnerLineInfoDAO.getPrivateSeaLineList(request.getKeyword(), request.getKeywordType(), request.getWorkflowStage(), PageInfo privateLineList = new PageInfo(hyPartnerLineInfoDAO.getPrivateSeaLineList(request.getKeyword(), request.getKeywordType(), request.getWorkflowStage(),
request.getWorkflowStatus(), request.getDeadlineStart(), request.getDeadlineEnd(), request.getWorkflowStatus(), request.getDeadlineStart(), request.getDeadlineEnd(),
request.getIntentArea(), request.getAcceptAdjustType(), request.getStoreKeyword(), intentAreaName, request.getAcceptAdjustType(), request.getStoreKeyword(),
request.getStoreKeywordType(), userIdsByScope.getInvestmentUserIds(),userIdsByScope.getDevelopmentUserIds())); request.getStoreKeywordType(), userIdsByScope.getInvestmentUserIds(),userIdsByScope.getDevelopmentUserIds()));
List<PrivateSeaLineDTO> list = privateLineList.getList(); List<PrivateSeaLineDTO> list = privateLineList.getList();
if (CollectionUtils.isEmpty(list)){ if (CollectionUtils.isEmpty(list)){
@@ -758,4 +762,18 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
return stageCountVO; return stageCountVO;
} }
/**
* getIntentAreaName
* @param intentArea
* @return
*/
private String getIntentAreaName(String intentArea){
String intentAreaName = null;
if (StringUtils.isNotEmpty(intentArea)){
HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(intentArea));
intentAreaName = hyOpenAreaInfoDO.getAreaName();
}
return intentAreaName;
}
} }