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

线索信息与基本信息

Browse Source
This commit is contained in:
苏竹红
2023-06-20 19:24:24 +08:00
parent c3cca6f27a
commit c11990517c
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,7 +302,7 @@
b.certify_file as certifyFile, b.certify_file as certifyFile,
b.pass_time as passTime, b.pass_time as passTime,
b.pass_user_id as passUserId b.pass_user_id as passUserId
from hy_partner_line_info a inner join hy_partner_base_info b from hy_partner_line_info a left join hy_partner_base_info b
on a.id = b.partner_line_id on a.id = b.partner_line_id
<where> <where>
<if test="lineId!=null"> <if test="lineId!=null">
@@ -450,7 +450,7 @@
hpuinfo.mobile as partnerUserPhone, hpuinfo.mobile as partnerUserPhone,
hpuinfo.shop_name as storeName, hpuinfo.shop_name as storeName,
hpuinfo.recommend_partner_name as recommendPartnerName, hpuinfo.recommend_partner_name as recommendPartnerName,
eu.name as investmentManagerName eu.name as investmentManagerName
FROM FROM
hy_partner_line_info hpli hy_partner_line_info hpli
LEFT JOIN hy_partner_intent_info hpii ON hpli.id = hpii.partner_line_id LEFT JOIN hy_partner_intent_info hpii ON hpli.id = hpii.partner_line_id

3
coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java
View File

@@ -39,8 +39,9 @@ public class PublicSeaLineListVo {
@ApiModelProperty("手机号归属地") @ApiModelProperty("手机号归属地")
private String phoneAddress; private String phoneAddress;
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
private Date createTime; private String createTime;
@ApiModelProperty("面试开始时间") @ApiModelProperty("面试开始时间")
private Date partnerInterviewStartTime; private Date partnerInterviewStartTime;

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

@@ -85,11 +85,19 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
partnerLineInfoAndBaseInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername()); partnerLineInfoAndBaseInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername());
partnerLineInfoAndBaseInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile()); partnerLineInfoAndBaseInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile());
} }
EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(partnerLineInfoAndBaseInfoDTO.getPassUserId()); EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(partnerLineInfoAndBaseInfoDTO.getPassUserId());
if (userInfo!=null){ if (userInfo!=null){
partnerLineInfoAndBaseInfoVO.setPassUserName(userInfo.getName()); partnerLineInfoAndBaseInfoVO.setPassUserName(userInfo.getName());
} }
//todo su 1、招商经理名称 手机号归属地 2、加盟商手机号归属地 if (StringUtils.isNotEmpty(partnerLineInfoAndBaseInfoVO.getPartnerUserPhone())){
DescribePhoneNumberDTO phoneNumberAttribute = aliyunService.getPhoneNumberAttribute(partnerLineInfoAndBaseInfoVO.getPartnerUserPhone());
partnerLineInfoAndBaseInfoVO.setPhoneAddress(phoneNumberAttribute!=null?phoneNumberAttribute.getCity():"");
}
EnterpriseUserDO investmentManager = enterpriseUserDAO.getUserInfoById(partnerLineInfoAndBaseInfoVO.getInvestmentManager());
if (investmentManager!=null){
partnerLineInfoAndBaseInfoVO.setInvestmentManagerName(investmentManager.getName());
}
return partnerLineInfoAndBaseInfoVO; return partnerLineInfoAndBaseInfoVO;
} }
@@ -285,7 +293,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
PublicSeaLineListVo publicSeaLineListVo = new PublicSeaLineListVo(); PublicSeaLineListVo publicSeaLineListVo = new PublicSeaLineListVo();
publicSeaLineListVo.setPartnerId(x.getPartnerId()); publicSeaLineListVo.setPartnerId(x.getPartnerId());
publicSeaLineListVo.setCreateTime(x.getCreateTime()); publicSeaLineListVo.setCreateTime(DateUtil.format(x.getCreateTime(),CoolDateUtils.DATE_FORMAT_SEC));
publicSeaLineListVo.setPartnerUserName(x.getUserName()); publicSeaLineListVo.setPartnerUserName(x.getUserName());
publicSeaLineListVo.setPartnerUserPhone(x.getMobile()); publicSeaLineListVo.setPartnerUserPhone(x.getMobile());
DescribePhoneNumberDTO phoneNumberAttribute = aliyunService.getPhoneNumberAttribute(x.getMobile()); DescribePhoneNumberDTO phoneNumberAttribute = aliyunService.getPhoneNumberAttribute(x.getMobile());
@@ -300,7 +308,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
publicSeaLineListVo.setRejectRealReason(hy.getRejectRealReason()); publicSeaLineListVo.setRejectRealReason(hy.getRejectRealReason());
publicSeaLineListVo.setLastCloseDate(hy.getCloseTime()); publicSeaLineListVo.setLastCloseDate(hy.getCloseTime());
publicSeaLineListVo.setLastInvestmentManager(hy.getInvestmentManager()); publicSeaLineListVo.setLastInvestmentManager(hy.getInvestmentManager());
publicSeaLineListVo.setPartnerUserPhone(mobileMap.get(hy.getInvestmentManager())); publicSeaLineListVo.setLastInvestmentManager(mobileMap.get(hy.getInvestmentManager()));
result.add(publicSeaLineListVo); result.add(publicSeaLineListVo);
}); });
publicSeaLineList.setList(result); publicSeaLineList.setList(result);