From 94b816008b672f092eee0474ae6cc9d06741b7f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 26 Jun 2023 10:21:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=A2=E8=AF=95ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 4 +++- .../java/com/cool/store/dto/partner/PrivateSeaLineDTO.java | 2 ++ .../src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index c03be5ef6..a25dfcd14 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -457,12 +457,14 @@ hpuinfo.mobile as partnerUserPhone, hpuinfo.shop_name as storeName, hpuinfo.recommend_partner_name as recommendPartnerName, - eu.name as investmentManagerName + eu.name as investmentManagerName, + hpip.id as interviewPlanId FROM hy_partner_line_info hpli LEFT JOIN hy_partner_intent_info hpii ON hpli.id = hpii.partner_line_id LEFT JOIN hy_partner_user_info hpuinfo ON hpli.partner_id = hpuinfo.partner_id LEFT JOIN enterprise_user eu ON hpli.investment_manager = eu.user_id + LEFT JOIN hy_partner_interview_plan hpip on hpli.id = hpip.partner_line_id WHERE line_status in (1,2) AND (eu.name like concat('%',#{keyword},'%') or hpuinfo.username like concat('%',#{keyword},'%')) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PrivateSeaLineDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PrivateSeaLineDTO.java index cfd98e6a0..d4861e884 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PrivateSeaLineDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PrivateSeaLineDTO.java @@ -69,4 +69,6 @@ public class PrivateSeaLineDTO { @ApiModelProperty("推荐加盟商名称") private String recommendPartnerName; + private Long interviewPlanId; + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java index 1692151cc..bf304c86e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java @@ -83,6 +83,8 @@ public class PrivateSeaLineListVo { @ApiModelProperty("推荐加盟商名称") private String recommendPartnerName; + private Long interviewPlanId; + public static List convertList(List list, Map finalDevManagerMap, Map wantShopAreaNameMap){ List resultList = new ArrayList<>(); @@ -111,6 +113,7 @@ public class PrivateSeaLineListVo { privateSeaLineListVo.setInvestmentManager(x.getInvestmentManager()); privateSeaLineListVo.setRecommendPartnerName(x.getRecommendPartnerName()); privateSeaLineListVo.setWorkflowStage(x.getWorkflowStage()); + privateSeaLineListVo.setInterviewPlanId(x.getInterviewPlanId()); privateSeaLineListVo.setWantShopArea(x.getWantShopArea()); privateSeaLineListVo.setWorkflowStage(x.getWorkflowStage()); privateSeaLineListVo.setDevelopmentManagerName(finalDevManagerMap.get(x.getDevelopmentManager()));