From db7973a80a08a52edda7713bd92e07b35813c297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Sun, 25 Jun 2023 20:14:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=9D=A2=E8=AF=95=E6=97=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/HyPartnerInterviewPlanMapper.xml | 6 +++--- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 1 + .../java/com/cool/store/service/impl/DeskServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 40c8554e0..994cb0277 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -277,11 +277,11 @@ diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 5ade9fde1..c03be5ef6 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -538,6 +538,7 @@ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 9f36c32d9..8489cf301 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -64,7 +64,7 @@ public class DeskServiceImpl implements DeskService { InterviewScheduleInfoVO interviewScheduleInfoVO = new InterviewScheduleInfoVO(); //查询面试数量 - String currentDate = DateUtil.format(dateTime, CoolDateUtils.DATE_FORMAT_DAY); + String currentDate = DateUtil.format(dateTime, CoolDateUtils.DATE_FORMAT_SEC); String startTime = DateUtil.format(CoolDateUtils.getDateFormatDayMinTime(1), CoolDateUtils.DATE_FORMAT_SEC); String endTime = DateUtil.format(CoolDateUtils.getDateFormatDay(7), CoolDateUtils.DATE_FORMAT_SEC); SpecialDateRangeInterviewCountDTO interviewCount = hyPartnerInterviewPlanDAO.getInterviewCount(userId, currentDate, startTime, endTime); From b6e395dc9ea3fcb466fdd72d625e71dd7916b27b Mon Sep 17 00:00:00 2001 From: pserimal Date: Sun, 25 Jun 2023 21:19:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?800=E5=B9=B3=E5=8F=B0=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=9B=9E=E8=B0=83=E6=88=90=E5=8A=9F=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/service/impl/FlowServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java index b9a73f109..b6ce5b439 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java @@ -213,6 +213,7 @@ public class FlowServiceImpl implements FlowService { } else if ("CANCELED".equals(request.getSequenceStatus())) { interviewDAO.updateInterviewWorkflowStatus(interviewPlanId, WorkflowStatusEnum.INTERVIEW_7); } + log.info("MDM800审批成功回调，request{}", JSONObject.toJSONString(request)); } From 16c94798f370a5a16b7e01f5367186d8d6151d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Mon, 26 Jun 2023 03:22:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/dao/HyInterviewDAO.java | 15 +++++ .../mapper/HyPartnerInterviewMapper.java | 6 +- .../mapper/HyPartnerInterviewPlanMapper.java | 6 +- .../store/mapper/HyPartnerLineInfoMapper.java | 9 +++ .../mapper/HyPartnerInterviewMapper.xml | 41 ++++++++++++- .../mapper/HyPartnerInterviewPlanMapper.xml | 17 ++---- .../mapper/HyPartnerLineInfoMapper.xml | 33 +++++++++++ .../java/com/cool/store/job/JobHandler.java | 5 +- .../HyPartnerInterviewPlanServiceImpl.java | 58 ++++++++++++------- 9 files changed, 147 insertions(+), 43 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInterviewDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInterviewDAO.java index c0ebcce7f..686ccc629 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInterviewDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInterviewDAO.java @@ -7,6 +7,7 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.List; @Repository public class HyInterviewDAO { @@ -31,4 +32,18 @@ public class HyInterviewDAO { lineInfoMapper.updateWorkflowStatus(lineId, status.getCode()); } + /** + * 根据线索id批量修改面试状态和线索表子流程状态 + * @param lineIds + * @param status + */ + @Transactional + public void batchUpdateInterviewWorkflowStatus(List lineIds, Integer status){ + //修改面试状态 + interviewMapper.batchUpdateStatusByLineIds(lineIds, status); + //修改线索表子流程状态 + lineInfoMapper.batchUpdateStatusByLineIds(lineIds, status); + + } + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java index 8a55371ab..a04704e1d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java @@ -69,7 +69,11 @@ public interface HyPartnerInterviewMapper { * @return */ List getInterviewBaseInfoList(@Param("record") GetInterviewListReq request); - void batchUpdateInterviewStatus(@Param("interviewIds") List interviewIdList, @Param("interviewStatus") Integer interviewStatus); + + List getInterviewBaseInfoListByLineIds(@Param("lineIds") List lineIds); + void batchUpdateInterviewStatus(@Param("interviewIds") List interviewIdList, @Param("status") Integer interviewStatus,@Param("deleted") Integer deleted); + + void batchUpdateStatusByLineIds(@Param("lineIds") List lineIds, @Param("status") Integer interviewStatus); HyPartnerInterviewDO getInterviewInfoByInterviewPlanId(@Param("interviewPlanId") String interviewPlanId); diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java index 71280f73f..dc43b813b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java @@ -119,10 +119,9 @@ public interface HyPartnerInterviewPlanMapper { /** * 仅适用于开启面试房间 - * @param record - * @param roomStatus + * @param lineIds */ - void openInterviewRoom(@Param("record") HyPartnerInterviewPlanDO record,@Param("roomStatus")Integer roomStatus); + void openInterviewRoom(@Param("lineIds") List lineIds,@Param("roomStatus")Integer roomStatu); /** * 仅适用于关闭面试房间 @@ -142,4 +141,5 @@ public interface HyPartnerInterviewPlanMapper { */ Integer getRoomStatus(@Param("interviewPlanId") String interviewPlanId); + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java index 666d50413..24314e0ca 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java @@ -215,4 +215,13 @@ public interface HyPartnerLineInfoMapper { * 修改线索状态 */ void updateWorkflowStatus(@Param("lineId") String lineId, @Param("status") String status); + + List getOverTimeReserveLineList(@Param("deadlineEnd") Date deadlineEnd, + @Param("workflowStage") String workflowStage, + @Param("workflowStatus") String workflowStatus); + + List getWaitForOpenInterviewLineList(@Param("startTime") Date startTime, + @Param("endTime") Date endTime); + + void batchUpdateStatusByLineIds(@Param("lineIds") List lineIds, @Param("status")Integer status); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml index 29edaeaa1..9402cbbd6 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml @@ -363,8 +363,11 @@ UPDATE hy_partner_interview - - status = #{status} + + status = #{status}, + + + deleted = #{deleted}, WHERE id in @@ -389,7 +392,7 @@ + + @@ -435,5 +463,12 @@ FROM hy_partner_interview WHERE interview_plan_id = #{interviewPlanId} + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 40c8554e0..5f914875e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -221,18 +221,11 @@ update hy_partner_interview_plan set room_status = #{roomStatus},update_time = now() - - and room_status = #{record.roomStatus} - - - and start_time >= #{record.startTime} - - - and start_time <= #{record.endTime} - - - and deleted = #{deleted} - + partner_line_id in + + #{item} + + and deleted = 0 diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 5ade9fde1..a02cdbf55 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -572,11 +572,44 @@ WHERE id = #{interviewPlanId} ) + + UPDATE hy_partner_line_info SET workflow_status = #{status} WHERE id = #{lineId} + + UPDATE hy_partner_line_info + SET workflow_status = #{status} + WHERE id IN + + #{lineId} + + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java b/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java index 4f5ae6b51..a62df02c9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java @@ -40,9 +40,9 @@ public class JobHandler { @XxlJob("updateInterviewOverTime") public void updateInterviewOverTime(){ try { - log.info("面试超时定时任务开始"); + log.info("面试超时预约定时任务开始"); hyPartnerInterviewPlanService.updateInterviewOverTime(); - log.info("面试超时定时任务结束"); + log.info("面试超时预约定时任务结束"); XxlJobHelper.handleSuccess(); }catch (Exception e){ log.error("面试超时定时任务异常",e); @@ -63,6 +63,7 @@ public class JobHandler { } } + @XxlJob("updateAbsentInterview") public void updateAbsentInterview(){ try { log.info("面试缺席定时任务开始"); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java index 369b0f6a4..181944ca6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java @@ -2,6 +2,7 @@ package com.cool.store.service.impl; import cn.hutool.core.date.DateUtil; import com.cool.store.constants.CommonConstants; +import com.cool.store.dao.HyInterviewDAO; import com.cool.store.dao.HyPartnerInterviewPlanDAO; import com.cool.store.dao.HyPartnerLineInfoDAO; import com.cool.store.dao.HyPartnerUserInfoDAO; @@ -15,6 +16,7 @@ import com.cool.store.enums.WorkflowStageEnum; import com.cool.store.enums.WorkflowStatusEnum; import com.cool.store.mapper.HyPartnerInterviewMapper; import com.cool.store.mapper.HyPartnerInterviewPlanMapper; +import com.cool.store.mapper.HyPartnerLineInfoMapper; import com.cool.store.request.CloseFollowRequest; import com.cool.store.request.GetInterviewListReq; import com.cool.store.service.HyPartnerInterviewPlanService; @@ -28,6 +30,7 @@ import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -61,6 +64,13 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan @Autowired HyPartnerLineInfoService hyPartnerLineInfoService; + @Autowired + HyPartnerLineInfoMapper hyPartnerLineInfoMapper; + + @Autowired + private HyInterviewDAO interviewDAO; + + @Override public List getInterviewPlanList(String userId) { String currentTime = DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_DAY); @@ -155,15 +165,14 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan } @Override + @Transactional public void updateInterviewOverTime() { - //查询三天前到两天前未预约的数据 - String startTime = DateUtil.formatDate(DateUtil.offsetDay(new Date(),-3)); - String endTime = DateUtil.formatDate(DateUtil.offsetDay(new Date(),-2)); - GetInterviewListReq getInterviewListReq = new GetInterviewListReq(); - getInterviewListReq.setStartTime(startTime); - getInterviewListReq.setEndTime(endTime); - getInterviewListReq.setStatus(Integer.valueOf(WorkflowStatusEnum.RESERVATION_0.getCode())); - List interviewBaseInfoList = hyPartnerInterviewMapper.getInterviewBaseInfoList(getInterviewListReq); + List overTimeReserveLineList = hyPartnerLineInfoMapper.getOverTimeReserveLineList(new Date(), WorkflowStageEnum.RESERVATION.getCode(), WorkflowStatusEnum.RESERVATION_0.getCode()); + if(CollectionUtils.isEmpty(overTimeReserveLineList)){ + return; + } + List lineIds = overTimeReserveLineList.stream().map(o -> o.getId()).collect(Collectors.toList()); + List interviewBaseInfoList = hyPartnerInterviewMapper.getInterviewBaseInfoListByLineIds(lineIds); if(CollectionUtils.isEmpty(interviewBaseInfoList)){ return; } @@ -171,27 +180,32 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan } @Override + @Transactional public void openInterviewRoom() { - //更新会议开始时间为十分钟之内的房间状态为开启 + //更新会议开始时间为5分钟之内的房间状态为开启,会议状态变为已开始 Date startTime = new Date(); - HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); - hyPartnerInterviewPlanDO.setStartTime(startTime); - hyPartnerInterviewPlanDO.setEndTime(DateUtil.offsetMinute(startTime,10)); - hyPartnerInterviewPlanDO.setRoomStatus(RoomStatus.WAIT_FOR_OPEN.getCode()); - hyPartnerInterviewPlanDO.setDeleted(false); - hyPartnerInterviewPlanMapper.openInterviewRoom(hyPartnerInterviewPlanDO, RoomStatus.OPEN.getCode()); + + List waitForOpenInterviewLineList = hyPartnerLineInfoMapper.getWaitForOpenInterviewLineList(startTime, DateUtil.offsetMinute(startTime, 5)); + if(CollectionUtils.isEmpty(waitForOpenInterviewLineList)){ + return; + } + //更新房间状态为开启 + List lineIds = waitForOpenInterviewLineList.stream().map(HyPartnerLineInfoDO::getId).collect(Collectors.toList()); + hyPartnerInterviewPlanMapper.openInterviewRoom(lineIds,RoomStatus.OPEN.getCode()); + interviewDAO.batchUpdateInterviewWorkflowStatus(lineIds,Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode())); } @Override + @Transactional public void updateAbsentInterview() { Date now = new Date(); //查询当天未参加的面试 - String startTime = DateUtil.formatDate(DateUtil.offsetHour(now,-6)); - String endTime = DateUtil.formatDate(now); + String startTime = DateUtil.formatDateTime(DateUtil.offsetHour(now,-6)); + String endTime = DateUtil.formatDateTime(now); GetInterviewListReq getInterviewListReq = new GetInterviewListReq(); getInterviewListReq.setStartTime(startTime); getInterviewListReq.setEndTime(endTime); - getInterviewListReq.setStatus(Integer.valueOf(WorkflowStatusEnum.RESERVATION_0.getCode())); + getInterviewListReq.setStatus(Integer.valueOf(WorkflowStatusEnum.INTERVIEW_3.getCode())); getInterviewListReq.setIsPartnerInterview(0); List interviewBaseInfoList = hyPartnerInterviewMapper.getInterviewBaseInfoList(getInterviewListReq); if(CollectionUtils.isEmpty(interviewBaseInfoList)){ @@ -206,17 +220,17 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan * @param rejectPublicReason */ public void handleOverTimeInterview(List interviewBaseInfoList,String rejectPublicReason){ - //1.更新面试信息表中超时未预约的面试信息 + //1.更新面试信息表中超时的面试信息 List interviewIds = interviewBaseInfoList.stream().map(HyPartnerInterviewDO::getId).distinct().collect(Collectors.toList()); - hyPartnerInterviewMapper.batchUpdateInterviewStatus(interviewIds,Integer.valueOf(WorkflowStatusEnum.RESERVATION_8.getCode())); - //2.更新面试计划表中超时未预约的信息 + hyPartnerInterviewMapper.batchUpdateInterviewStatus(interviewIds,Integer.valueOf(WorkflowStatusEnum.RESERVATION_8.getCode()),1); + //2.更新面试计划表中超时的信息 List interviewPlanIds = interviewBaseInfoList.stream().map(HyPartnerInterviewDO::getInterviewPlanId).distinct().collect(Collectors.toList()); hyPartnerInterviewPlanMapper.batchDeleteInterviewPlans(interviewPlanIds); //3.更新线索表中超时未预约的线路信息 List lineIds = interviewBaseInfoList.stream().map(HyPartnerInterviewDO::getPartnerLineId).distinct().collect(Collectors.toList()); for (Long lineId : lineIds) { CloseFollowRequest closeFollowRequest = new CloseFollowRequest(); - closeFollowRequest.setRejectPublicReason("超时未面试"); + closeFollowRequest.setRejectPublicReason(rejectPublicReason); closeFollowRequest.setLineId(lineId); closeFollowRequest.setType("overtime_interview"); hyPartnerLineInfoService.closeOrPassFollow(null,closeFollowRequest); 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 4/4] =?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()));