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

Merge branch 'dev/feat/partner1.6_20231226' into pre

Browse Source
This commit is contained in:
feng.li
2023-12-27 14:30:04 +08:00
parent 1f3a2e26e9 ac81c9111b
commit 2581a2cb6a
10 changed files with 69 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerExhibitionDO.java
View File

@@ -1,14 +1,15 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.Table;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
*
* @author zhangchenbiao
@@ -26,6 +27,12 @@ public class HyPartnerExhibitionDO implements Serializable {
@ApiModelProperty("报名的展会id，hy_exhibition.id")
private Integer exhibitionId;
@ApiModelProperty("进行面试的会销创建人姓名")
private String exhibitionCreatorName;
@ApiModelProperty("进行面试的会销创建人手机号")
private String exhibitionCreatorMobile;
@ApiModelProperty("线索id，hy_partner_line_info.id")
private Long partnerLineId;

6
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerExhibitionInterviewDO.java
View File

@@ -23,4 +23,10 @@ public class HyPartnerExhibitionInterviewDO {
@ApiModelProperty("面试计划id")
private Long interviewPlanId;
@ApiModelProperty("进行面试的会销创建人姓名")
private String exhibitionCreatorName;
@ApiModelProperty("进行面试的会销创建人手机号")
private String exhibitionCreatorMobile;
}

22
coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java
View File

@@ -1,20 +1,22 @@
package com.cool.store.vo;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import com.cool.store.dto.partner.PrivateSeaLineDTO;
import com.cool.store.entity.HyPartnerExhibitionDO;
import com.cool.store.entity.HyPartnerInterviewPlanDO;
import com.cool.store.utils.CoolDateUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @Author suzhuhong
@@ -90,6 +92,12 @@ public class PrivateSeaLineListVo {
@ApiModelProperty("是否处于会销面试中")
private Boolean whetherExhibitionInterview;
@ApiModelProperty("进行面试的会销创建人姓名")
private String exhibitionCreatorName;
@ApiModelProperty("进行面试的会销创建人手机号")
private String exhibitionCreatorMobile;
@ApiModelProperty("推荐加盟商ID")
private String recommendPartnerId;
@@ -114,9 +122,10 @@ public class PrivateSeaLineListVo {
public static List<PrivateSeaLineListVo> convertList(List<PrivateSeaLineDTO> list, Map<String, String> finalDevManagerMap, Map<String, String> wantShopAreaNameMap,
Map<Long, HyPartnerInterviewPlanDO> hyPartnerInterviewPlanDOMap,Map<Integer, String> channelMap,Map<Long, String> userPortraitMap,
List<Long> exhibitionInterviewLines){
Map<Long, HyPartnerInterviewPlanDO> hyPartnerInterviewPlanDOMap, Map<Integer, String> channelMap, Map<Long, String> userPortraitMap,
List<HyPartnerExhibitionDO> partnerExhibitions){
List<PrivateSeaLineListVo> resultList = new ArrayList<>();
Map<Long, HyPartnerExhibitionDO> lineIdPartnerExhibitionMap = partnerExhibitions.stream().collect(Collectors.toMap(HyPartnerExhibitionDO::getPartnerLineId, data -> data));
for (PrivateSeaLineDTO x : list) {
PrivateSeaLineListVo privateSeaLineListVo = new PrivateSeaLineListVo();
privateSeaLineListVo.setLineId(x.getLineId());
@@ -171,10 +180,11 @@ public class PrivateSeaLineListVo {
}
//在会销面试中的线索
privateSeaLineListVo.setWhetherExhibitionInterview(Boolean.FALSE);
if (privateSeaLineListVo.getWhetherInExhibition()
&& ObjectUtils.isNotEmpty(exhibitionInterviewLines)
&& exhibitionInterviewLines.contains(x.getLineId())) {
if (CollUtil.isNotEmpty(partnerExhibitions)
&& lineIdPartnerExhibitionMap.containsKey(x.getLineId())) {
privateSeaLineListVo.setWhetherExhibitionInterview(Boolean.TRUE);
privateSeaLineListVo.setExhibitionCreatorName(lineIdPartnerExhibitionMap.get(x.getLineId()).getExhibitionCreatorName());
privateSeaLineListVo.setExhibitionCreatorMobile(lineIdPartnerExhibitionMap.get(x.getLineId()).getExhibitionCreatorMobile());
}
privateSeaLineListVo.setUserPortraitList(userPortraitList);
resultList.add(privateSeaLineListVo);

6
coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java
View File

@@ -145,4 +145,10 @@ public class InterviewVO {
@ApiModelProperty("展会日期")
private String exhibitionDate;
@ApiModelProperty("进行面试的会销创建人姓名")
private String exhibitionCreatorName;
@ApiModelProperty("进行面试的会销创建人手机号")
private String exhibitionCreatorMobile;
}