From c11990517c217dc589c779caf794685e3c4040e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 20 Jun 2023 19:24:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E4=BF=A1=E6=81=AF=E4=B8=8E?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/HyPartnerLineInfoMapper.xml | 4 ++-- .../com/cool/store/vo/PublicSeaLineListVo.java | 3 ++- .../service/impl/HyPartnerLineInfoServiceImpl.java | 14 +++++++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 0438e9b35..20811f5a4 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -302,7 +302,7 @@ b.certify_file as certifyFile, b.pass_time as passTime, 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 @@ -450,7 +450,7 @@ hpuinfo.mobile as partnerUserPhone, hpuinfo.shop_name as storeName, hpuinfo.recommend_partner_name as recommendPartnerName, - eu.name as investmentManagerName + eu.name as investmentManagerName FROM hy_partner_line_info hpli LEFT JOIN hy_partner_intent_info hpii ON hpli.id = hpii.partner_line_id diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java index 848d704ee..ecad5c955 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java @@ -39,8 +39,9 @@ public class PublicSeaLineListVo { @ApiModelProperty("手机号归属地") private String phoneAddress; + @ApiModelProperty("创建时间") - private Date createTime; + private String createTime; @ApiModelProperty("面试开始时间") private Date partnerInterviewStartTime; 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 61a420e18..7196a3617 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 @@ -85,11 +85,19 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { partnerLineInfoAndBaseInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername()); partnerLineInfoAndBaseInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile()); } + EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(partnerLineInfoAndBaseInfoDTO.getPassUserId()); if (userInfo!=null){ 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; } @@ -285,7 +293,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { PublicSeaLineListVo publicSeaLineListVo = new PublicSeaLineListVo(); publicSeaLineListVo.setPartnerId(x.getPartnerId()); - publicSeaLineListVo.setCreateTime(x.getCreateTime()); + publicSeaLineListVo.setCreateTime(DateUtil.format(x.getCreateTime(),CoolDateUtils.DATE_FORMAT_SEC)); publicSeaLineListVo.setPartnerUserName(x.getUserName()); publicSeaLineListVo.setPartnerUserPhone(x.getMobile()); DescribePhoneNumberDTO phoneNumberAttribute = aliyunService.getPhoneNumberAttribute(x.getMobile()); @@ -300,7 +308,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { publicSeaLineListVo.setRejectRealReason(hy.getRejectRealReason()); publicSeaLineListVo.setLastCloseDate(hy.getCloseTime()); publicSeaLineListVo.setLastInvestmentManager(hy.getInvestmentManager()); - publicSeaLineListVo.setPartnerUserPhone(mobileMap.get(hy.getInvestmentManager())); + publicSeaLineListVo.setLastInvestmentManager(mobileMap.get(hy.getInvestmentManager())); result.add(publicSeaLineListVo); }); publicSeaLineList.setList(result);