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

私海

Browse Source
This commit is contained in:
苏竹红
2024-04-02 14:19:29 +08:00
parent b9c2947a08
commit 1ef3e9ea44
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java
View File

@@ -97,8 +97,8 @@ public class LineInfoDAO {
return lineInfo; return lineInfo;
} }
public List<LineInfoDO> lineList(LineListRequest lineListRequest, String userId, List<Long> wantShopAreaIds) { public List<LineInfoDO> lineList(LineListRequest lineListRequest,String wantShopAreaName, String userId, List<Long> wantShopAreaIds) {
List<LineInfoDO> lineInfo = lineInfoMapper.lineList(lineListRequest,userId,wantShopAreaIds); List<LineInfoDO> lineInfo = lineInfoMapper.lineList(lineListRequest,wantShopAreaName,userId,wantShopAreaIds);
return lineInfo; return lineInfo;
} }

1
coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java
View File

@@ -37,6 +37,7 @@ public interface LineInfoMapper extends Mapper<LineInfoDO> {
* @return * @return
*/ */
List<LineInfoDO> lineList(@Param("request") LineListRequest lineListRequest, List<LineInfoDO> lineList(@Param("request") LineListRequest lineListRequest,
@Param("wantShopAreaName") String wantShopAreaName,
@Param("userId") String userId, @Param("userId") String userId,
@Param("wantShopAreaIds") List<Long> wantShopAreaIds); @Param("wantShopAreaIds") List<Long> wantShopAreaIds);

3
coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
View File

@@ -326,6 +326,9 @@
<if test="userId != null and userId != ''"> <if test="userId != null and userId != ''">
and investment_manager = #{userId} and investment_manager = #{userId}
</if> </if>
<if test="wantShopAreaName != null">
and b.area_path like concat('%',#{wantShopAreaName},'%')
</if>
<if test="request.userName != null and request.username!=''"> <if test="request.userName != null and request.username!=''">
and username = #{request.userName} and username = #{request.userName}
</if> </if>

2
coolstore-partner-model/src/main/java/com/cool/store/request/LineListRequest.java
View File

@@ -27,7 +27,7 @@ public class LineListRequest extends PageBasicInfo {
@ApiModelProperty("线索创建时间_结束") @ApiModelProperty("线索创建时间_结束")
private String createTimeEnd; private String createTimeEnd;
@ApiModelProperty("意向区域ID") @ApiModelProperty("意向区域ID")
private Integer wantShopAreaId; private Long wantShopAreaId;
@ApiModelProperty("线索来源") @ApiModelProperty("线索来源")
private Integer lineSource; private Integer lineSource;
@ApiModelProperty("招商经理ID") @ApiModelProperty("招商经理ID")

9
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
View File

@@ -114,8 +114,13 @@ public class LineServiceImpl implements LineService {
userId = loginUserInfo.getUserId(); userId = loginUserInfo.getUserId();
} }
} }
String areaName = null;
if (lineListRequest.getWantShopAreaId() != null){
HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(lineListRequest.getWantShopAreaId());
areaName = hyOpenAreaInfoDO.getAreaPath();
}
PageHelper.startPage(lineListRequest.getPageNum(), lineListRequest.getPageSize()); PageHelper.startPage(lineListRequest.getPageNum(), lineListRequest.getPageSize());
List<LineInfoDO> lineInfoDOS = lineInfoDAO.lineList(lineListRequest, userId, wantShopAreaIds); List<LineInfoDO> lineInfoDOS = lineInfoDAO.lineList(lineListRequest,areaName, userId, wantShopAreaIds);
PageInfo page = new PageInfo(lineInfoDOS); PageInfo page = new PageInfo(lineInfoDOS);
Map<Long, HyPartnerLabelDO> userPortraitMap = deskService.getUserPortraitMap(lineInfoDOS); Map<Long, HyPartnerLabelDO> userPortraitMap = deskService.getUserPortraitMap(lineInfoDOS);
List<Long> wantShopAreaIdList = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); List<Long> wantShopAreaIdList = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList());
@@ -191,7 +196,7 @@ public class LineServiceImpl implements LineService {
String areaName = null; String areaName = null;
if (partnerRequest.getWantShopAreaId() != null){ if (partnerRequest.getWantShopAreaId() != null){
HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(partnerRequest.getWantShopAreaId()); HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(partnerRequest.getWantShopAreaId());
areaName = hyOpenAreaInfoDO.getAreaName(); areaName = hyOpenAreaInfoDO.getAreaPath();
} }
PageHelper.startPage(partnerRequest.getPageNum(), partnerRequest.getPageSize()); PageHelper.startPage(partnerRequest.getPageNum(), partnerRequest.getPageSize());
List<LineInfoDO> lineInfoDOS = lineInfoDAO.partnerList(partnerRequest,areaName, userId, wantShopAreaIds); List<LineInfoDO> lineInfoDOS = lineInfoDAO.partnerList(partnerRequest,areaName, userId, wantShopAreaIds);