diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index 6d21d40ea..31a74495e 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -111,4 +111,7 @@ public class CommonConstants { public static final String NINE_STR = "9"; public static final String TEN_STR = "10"; + public static final String FOLLOW = "follow"; + public static final String PENDING = "pending"; + } diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 923b814b5..471ca6cd7 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -44,6 +44,14 @@ public enum ErrorCodeEnum { USER_GROUP_NAME_EXIST(1021076, "用户分组名称已存在", null), USER_GROUP_NOT_EXIST(1021077, "用户分组不存在", null), GET_INFO_ERROR(1021078, "获取信息异常", null), + + + + + PARAMS_REQUIRED(400002, "参数缺失！", null), + + + LINE_ID_IS_NOT_EXIST(500001, "线索ID不存在！", null), ; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStageEnum.java new file mode 100644 index 000000000..042ffded3 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStageEnum.java @@ -0,0 +1,33 @@ +package com.cool.store.enums; + +/** + * @Author suzhuhong + * @Date 2023/6/9 16:17 + * @Version 1.0 + */ +public enum WorkflowStageEnum { + + INTENT("1","意向申请阶段"), + RESERVATION("2","预约面试阶段"), + INTERVIEW("3","合格资格面试"), + ; + + private String code; + + private String message; + + WorkflowStageEnum(String code, String message) { + this.code = code; + this.message = message; + } + + + public String getCode() { + return code; + } + + public String getMessage() { + return message; + } + +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java new file mode 100644 index 000000000..e83971fdf --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java @@ -0,0 +1,49 @@ +package com.cool.store.enums; + +/** + * @Author suzhuhong + * @Date 2023/6/9 16:35 + * @Version 1.0 + */ +public enum WorkflowStatusEnum { + //意向申请阶段 + INTENT_0("0","待提交"), + INTENT_1("1","待审核"), + INTENT_2("2","已通过"), + INTENT_3("3","未通过"), + + //预约面试阶段 + RESERVATION_0("0","待预约"), + RESERVATION_6("6","到期未预约"), + + + //合格资格面试 + INTERVIEW_1("1","待面试"), + INTERVIEW_2("2","已开始"), + INTERVIEW_3("3","待审核"), + INTERVIEW_4("4","审核中"), + INTERVIEW_5("5","审核通过"), + INTERVIEW_6("6","拒绝"), + + + ; + + private String code; + + private String message; + + WorkflowStatusEnum(String code, String message) { + this.code = code; + this.message = message; + } + + + public String getCode() { + return code; + } + + public String getMessage() { + return message; + } + +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java new file mode 100644 index 000000000..a73252778 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java @@ -0,0 +1,35 @@ +package com.cool.store.utils; + +import java.util.Calendar; +import java.util.Date; + +/** + * @Author suzhuhong + * @Date 2023/6/8 17:17 + * @Version 1.0 + */ +public class CoolDateUtils { + + public static final String DATE_FORMAT_DAY = "yyyy-MM-dd"; + public static final String DATE_FORMAT_DAY_2 = "yyyy/MM/dd"; + public static final String TIME_FORMAT_SEC = "HH:mm:ss"; + public static final String TIME_FORMAT_SEC2 = "HH:mm"; + public static final String DATE_FORMAT_SEC = "yyyy-MM-dd HH:mm:ss"; + public static final String DATE_FORMAT_SEC_2 = "yyyy/MM/dd HH:mm:ss"; + public static final String DATE_FORMAT_SEC_3 = "yyyy.MM.dd HH:mm:ss"; + public static final String DATE_FORMAT_SEC_4 = "yyyy.MM.dd HH:mm"; + public static final String DATE_FORMAT_SEC_5 = "yyyy.MM.dd HH:mm"; + public static final String DATE_FORMAT_SEC_6 = "yyyy.MM.dd"; + /** + * 几天后的当前 + * @param d + * @param day + * @return + */ + public static Date getDateBefore(Date d, int day) { + Calendar now = Calendar.getInstance(); + now.setTime(d); + now.set(Calendar.DATE, now.get(Calendar.DATE) + day); + return now.getTime(); + } +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java new file mode 100644 index 000000000..211c5f87f --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java @@ -0,0 +1,59 @@ +package com.cool.store.dao; + +import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO; +import com.cool.store.entity.HyPartnerIntentInfoDO; +import com.cool.store.mapper.HyPartnerIntentInfoMapper; +import com.github.pagehelper.PageInfo; +import com.google.common.collect.Lists; +import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/6/9 15:02 + * @Version 1.0 + */ +@Repository +public class HyPartnerIntentInfoDAO { + + + @Resource + HyPartnerIntentInfoMapper hyPartnerIntentInfoMapper; + + public int insertSelective( HyPartnerIntentInfoDO record){ + return hyPartnerIntentInfoMapper.insertSelective(record); + } + + public int updateByPrimaryKeySelective(HyPartnerIntentInfoDO record){ + return hyPartnerIntentInfoMapper.updateByPrimaryKeySelective(record); + } + + public HyPartnerIntentInfoDO selectByPrimaryKeySelective(Long id){ + if (id==null){ + return null; + } + return hyPartnerIntentInfoMapper.selectByPrimaryKeySelective(id); + } + + + public PageInfo selectPartnerIntentApplyInfoList(String userId, String workflowStage, String workflowStatus){ + if (StringUtils.isEmpty(userId)){ + return new PageInfo<>(); + } + return hyPartnerIntentInfoMapper.selectPartnerIntentApplyInfoList(userId,workflowStage,workflowStatus); + } + + + public PartnerIntentApplyInfoDTO selectByLineId(Long lineId){ + if (lineId==null){ + return null; + } + return hyPartnerIntentInfoMapper.selectByLineId(lineId); + } + + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java new file mode 100644 index 000000000..5153b4a99 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java @@ -0,0 +1,85 @@ +package com.cool.store.dao; + +import com.cool.store.dto.partner.PartnerInterviewInfoDTO; +import com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO; +import com.cool.store.entity.HyPartnerInterviewPlanDO; +import com.cool.store.mapper.HyPartnerInterviewPlanMapper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/6/8 14:54 + * @Version 1.0 + */ +@Repository +public class HyPartnerInterviewPlanDAO { + + @Resource + HyPartnerInterviewPlanMapper hyPartnerInterviewPlanMapper; + + + /** + * 查询当前用户当天是否有面试 + * @param userId + * @param currentDate + * @return + */ + public Integer getCurrentDateInterviewCount(String userId,String currentDate){ + if (StringUtils.isEmpty(userId)){ + return 0; + } + return hyPartnerInterviewPlanMapper.getCurrentDateInterviewCount(userId,currentDate); + } + + /** + * 查询指定日期面试数量 与未来7天面试数量 + * @param userId + * @param currentDate + * @param startTime + * @param endTime + * @return + */ + public SpecialDateRangeInterviewCountDTO getInterviewCount(String userId, String currentDate, String startTime, String endTime){ + if (StringUtils.isEmpty(userId)){ + return new SpecialDateRangeInterviewCountDTO(); + } + return hyPartnerInterviewPlanMapper.getInterviewCount(userId,currentDate,startTime,endTime); + } + + + /** + * 当天还有几场面试 + * @param userId + * @param currentDate + * @return + */ + public List getInterviewPlanList(String userId, String currentDate){ + if (StringUtils.isEmpty(userId)){ + return new ArrayList<>(); + } + return hyPartnerInterviewPlanMapper.getInterviewPlanList(userId,currentDate); + } + + /** + * 工作台 招商经理 预约面试时间 合格资格面试 列表 + * @param userId + * @param workflowStage + * @param workflowStatus + * @return + */ + public PageInfo getPartnerInterviewInfoList(String userId, String workflowStage,String workflowStatus){ + if (StringUtils.isEmpty(userId)){ + return new PageInfo(); + } + return hyPartnerInterviewPlanMapper.getPartnerInterviewInfoList(userId,workflowStage,workflowStatus); + } + + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java new file mode 100644 index 000000000..f72326c2d --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java @@ -0,0 +1,111 @@ +package com.cool.store.dao; + +import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO; +import com.cool.store.dto.partner.PartnerLineInfoAndBaseInfoDTO; +import com.cool.store.dto.partner.StageCountDTO; +import com.cool.store.entity.HyPartnerLineInfoDO; +import com.cool.store.mapper.HyPartnerLineInfoMapper; +import com.github.pagehelper.PageInfo; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/6/8 15:10 + * @Version 1.0 + */ +@Repository +public class HyPartnerLineInfoDAO { + + + @Resource + HyPartnerLineInfoMapper hyPartnerLineInfoMapper; + + + public int insertSelective(HyPartnerLineInfoDO hyPartnerLineInfoDO){ + return hyPartnerLineInfoMapper.insertSelective(hyPartnerLineInfoDO); + } + + public int batchInsert(List hyPartnerLineInfoDOS){ + if (CollectionUtils.isEmpty(hyPartnerLineInfoDOS)){ + return -1; + } + return hyPartnerLineInfoMapper.batchInsert(hyPartnerLineInfoDOS); + } + + + public int batchDeleted(List lineIdList){ + if (CollectionUtils.isEmpty(lineIdList)){ + return -1; + } + return hyPartnerLineInfoMapper.batchDeleted(lineIdList); + } + + public HyPartnerLineInfoDO selectByPrimaryKeySelective(Long id){ + if (id==null){ + return null; + } + return hyPartnerLineInfoMapper.selectByPrimaryKeySelective(id); + } + + + public Integer getAdventLineCount( String userId, String currentDate){ + if (StringUtils.isEmpty(userId)){ + return 0; + } + return hyPartnerLineInfoMapper.getAdventLineCount(userId,currentDate); + } + + public StageCountDTO selectStagePendingCount(String userId){ + if (StringUtils.isEmpty(userId)){ + return new StageCountDTO(0,0); + } + return hyPartnerLineInfoMapper.selectStagePendingCount(userId); + } + + public StageCountDTO selectStageFollowCount(String userId){ + if (StringUtils.isEmpty(userId)){ + return new StageCountDTO(0,0,0); + } + return hyPartnerLineInfoMapper.selectStageFollowCount(userId); + } + + + public PartnerLineInfoAndBaseInfoDTO selectPartnerLineInfoAndBaseInfo(Long lineId){ + if (lineId==null){ + return null; + } + return hyPartnerLineInfoMapper.selectPartnerLineInfoAndBaseInfo(lineId); + } + + public PageInfo lastMonthCloseLine(String userId, String lastMonthTodayDate){ + if (userId==null){ + return new PageInfo<>(); + } + return hyPartnerLineInfoMapper.lastMonthCloseLine(userId,lastMonthTodayDate); + } + + public int updateInvestmentManager(String userId, List lineIdList){ + if (StringUtils.isEmpty(userId)||CollectionUtils.isEmpty(lineIdList)){ + return -1; + } + return hyPartnerLineInfoMapper.updateInvestmentManager(lineIdList,userId); + } + + + + public List getLineListByLineIds( List lineIdList){ + if (CollectionUtils.isEmpty(lineIdList)){ + return Lists.newArrayList(); + } + return hyPartnerLineInfoMapper.getLineListByLineIds(lineIdList); + } + + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserInfoDAO.java new file mode 100644 index 000000000..04aee62d5 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserInfoDAO.java @@ -0,0 +1,51 @@ +package com.cool.store.dao; + +import com.cool.store.entity.HyPartnerUserInfoDO; +import com.cool.store.mapper.HyPartnerUserInfoMapper; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/6/8 19:41 + * @Version 1.0 + */ +@Repository +public class HyPartnerUserInfoDAO { + + + @Resource + HyPartnerUserInfoMapper hyPartnerUserInfoMapper; + + + /** + * 根据PartnerId查询用户 + * @param partnerId + * @return + */ + public HyPartnerUserInfoDO selectByPartnerId(String partnerId){ + if (StringUtils.isEmpty(partnerId)){ + return null; + } + return hyPartnerUserInfoMapper.selectByPartnerId(partnerId); + } + + /** + * 根据PartnerIds批量查询用户 + * @param partnerIds + * @return + */ + public List selectByPartnerIds(List partnerIds){ + if (CollectionUtils.isEmpty(partnerIds)){ + return Lists.newArrayList(); + } + return hyPartnerUserInfoMapper.selectByPartnerIds(partnerIds); + } + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java index 9764d0ad5..cd68c7a3e 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java @@ -1,8 +1,12 @@ package com.cool.store.mapper; +import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO; import com.cool.store.entity.HyPartnerIntentInfoDO; +import com.github.pagehelper.PageInfo; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author zhangchenbiao * @date 2023-05-29 03:52 @@ -16,10 +20,31 @@ public interface HyPartnerIntentInfoMapper { */ int insertSelective(@Param("record") HyPartnerIntentInfoDO record); + HyPartnerIntentInfoDO selectByPrimaryKeySelective(@Param("id") Long id); + /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:52 */ int updateByPrimaryKeySelective(@Param("record") HyPartnerIntentInfoDO record); + + + /** + * 工作台 招商经理 意向申请阶段 待处理 待跟进 列表 + * @param userId + * @param workflowStage + * @param workflowStatus + * @return + */ + PageInfo selectPartnerIntentApplyInfoList(@Param("userId") String userId, + @Param("workflowStage") String workflowStage , + @Param("workflowStatus") String workflowStatus); + + /** + * 根据线索ID查询数据 + * @param lineId + * @return + */ + PartnerIntentApplyInfoDTO selectByLineId(@Param("lineId") Long lineId); } \ No newline at end of file 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 25b436937..44fe9cb77 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 @@ -1,8 +1,14 @@ package com.cool.store.mapper; +import com.cool.store.dto.partner.PartnerInterviewInfoDTO; +import com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO; import com.cool.store.entity.HyPartnerInterviewPlanDO; +import com.github.pagehelper.PageInfo; import org.apache.ibatis.annotations.Param; +import java.util.Date; +import java.util.List; + /** * @author zhangchenbiao * @date 2023-05-29 03:52 @@ -22,4 +28,46 @@ public interface HyPartnerInterviewPlanMapper { * dateTime:2023-05-29 03:52 */ int updateByPrimaryKeySelective(@Param("record") HyPartnerInterviewPlanDO record); + + /** + * 查询当天面试数量 + * @param userId + * @param currentDate + * @return + */ + Integer getCurrentDateInterviewCount(@Param("userId") String userId, @Param("currentDate") String currentDate); + + /** + * todo 当天面试数据需要修改 + * 查询指定日期面试数量 与未来7天面试数量 + * @param userId + * @param currentDate + * @param startTime + * @param endTime + * @return + */ + SpecialDateRangeInterviewCountDTO getInterviewCount(@Param("userId") String userId, + @Param("currentDate") String currentDate, + @Param("startTime") String startTime, + @Param("endTime") String endTime); + + /** + * 查询面试列表 + * @param userId + * @param currentDate + * @return + */ + List getInterviewPlanList(@Param("userId") String userId, + @Param("currentDate") String currentDate); + + /** + * 工作台 招商经理 预约面试时间 合格资格面试 列表 + * @param userId + * @param workflowStage + * @param workflowStatus + * @return + */ + PageInfo getPartnerInterviewInfoList(@Param("userId") String userId, + @Param("workflowStage") String workflowStage , + @Param("workflowStatus") String workflowStatus); } \ 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 936823266..4c42bdae1 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 @@ -1,9 +1,15 @@ package com.cool.store.mapper; +import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO; +import com.cool.store.dto.partner.PartnerLineInfoAndBaseInfoDTO; +import com.cool.store.dto.partner.StageCountDTO; import com.cool.store.entity.HyPartnerLineInfoDO; import com.cool.store.entity.HyPartnerLineInfoDO; +import com.github.pagehelper.PageInfo; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author zhangchenbiao * @date 2023-05-29 03:52 @@ -17,10 +23,86 @@ public interface HyPartnerLineInfoMapper { */ int insertSelective(@Param("record") HyPartnerLineInfoDO record); + /** + * 批量新增线索 + * @param recordList + * @return + */ + int batchInsert(@Param("recordList") List recordList); + + /** + * 批量将线索置为删除状态 + * @param lineIdList + * @return + */ + int batchDeleted(@Param("lineIdList") List lineIdList); + + /** + * 根据ID查询数据 + * @param id + * @return + */ + HyPartnerLineInfoDO selectByPrimaryKeySelective(Long id); + + /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:52 */ int updateByPrimaryKeySelective(@Param("record") HyPartnerLineInfoDO record); + + /** + * 当前用户指定时间 临期线索 + * @param userId + * @param currentDate + * @return + */ + Integer getAdventLineCount(@Param("userId") String userId, @Param("currentDate") String currentDate); + + /** + * 招商经理 对应各阶段待处理数据 + * @param userId + * @return + */ + StageCountDTO selectStagePendingCount(@Param("userId") String userId); + + /** + * 招商经理 对应各个阶段 待跟进数据 + * @param userId + * @return + */ + StageCountDTO selectStageFollowCount(@Param("userId") String userId); + + + /** + * 查询线索信息与加盟商基本信息 + * @param lineId + * @return + */ + PartnerLineInfoAndBaseInfoDTO selectPartnerLineInfoAndBaseInfo(@Param("lineId") Long lineId); + + /** + * 最近30天结束的线索 + * @param userId + * @param lastMonthTodayDate + * @return + */ + PageInfo lastMonthCloseLine(@Param("userId") String userId, + @Param("lastMonthTodayDate") String lastMonthTodayDate); + + /** + * 修改招商经理 + * @param lineIdList + * @param userId + * @return + */ + int updateInvestmentManager(@Param("lineIdList") List lineIdList, @Param("userId") String userId); + + /** + * 根据线索ID查询线索 + * @param lineIdList + * @return + */ + List getLineListByLineIds(List lineIdList); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java index 300a9a959..3c0b9be58 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java @@ -3,6 +3,8 @@ package com.cool.store.mapper; import com.cool.store.entity.HyPartnerUserInfoDO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author zhangchenbiao * @date 2023-05-29 03:53 @@ -22,4 +24,18 @@ public interface HyPartnerUserInfoMapper { * dateTime:2023-05-29 03:53 */ int updateByPrimaryKeySelective(@Param("record") HyPartnerUserInfoDO record); + + /** + * 根据partnerID查询用户信息 + * @param partnerId + * @return + */ + HyPartnerUserInfoDO selectByPartnerId(@Param("partnerId") String partnerId); + + /** + * 根据partnerIDs批量查询用户信息 + * @param partnerIdList + * @return + */ + List selectByPartnerIds(@Param("partnerIdList") List partnerIdList); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml index fbc690fb3..e495f858c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml @@ -32,6 +32,14 @@ work_exp, is_consumer, other_band, brand_strength, need_improve, strength, weakness, create_time, update_time + insert into hy_partner_intent_info @@ -243,4 +251,41 @@ where id = #{record.id} + + + + + \ 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 8d9f83e09..c20826590 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -172,4 +172,69 @@ where id = #{record.id} + + + + + + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index a02351c7a..104c5a8ec 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -27,6 +27,49 @@ reject_real_reason, certify_file, deleted, create_time, update_time, close_time, close_user_id + + + + + + insert into + hy_partner_line_info + ( + partner_id, + workflow_stage, + workflow_status, + line_status, + investment_manager + ) + values + + (#{record.partnerId}, + #{record.workflowStage}, + #{record.workflowStatus}, + #{record.lineStatus}, + #{record.investmentManager}) + + + + + update hy_partner_line_info + set deleted = 1 + + + + #{lineId} + + + + + + + insert into hy_partner_line_info @@ -193,4 +236,104 @@ where id = #{record.id} + + + + + + + + + + + + + + update hy_partner_line_info + set investment_manager = #{userId} + + + #{lineId} + + + + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml index c66e654db..c0e32f713 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml @@ -18,6 +18,25 @@ id, partner_id, mobile, username, live_area, want_shop_area, accept_adjust_type, invite_code, is_write_partner_know, create_time, update_time + + + + + insert into hy_partner_user_info diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerIntentApplyInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerIntentApplyInfoDTO.java new file mode 100644 index 000000000..05d9f67e9 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerIntentApplyInfoDTO.java @@ -0,0 +1,49 @@ +package com.cool.store.dto.partner; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author suzhuhong + * @Date 2023/6/9 15:37 + * @Version 1.0 + */ +@Data +public class PartnerIntentApplyInfoDTO { + + @ApiModelProperty("") + private Long id; + + @ApiModelProperty("加盟商用户名称") + private String partnerUserName; + + @ApiModelProperty("hy_partner_user_info.partner_id") + private String partnerId; + + @ApiModelProperty("hy_partner_line_info.id") + private Long partnerLineId; + + @ApiModelProperty("常驻区域") + private String liveArea; + + @ApiModelProperty("意向开店区域") + private String wantShopArea; + + @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") + private Integer acceptAdjustType; + + @ApiModelProperty("截止时间") + private Date deadline; + + @ApiModelProperty("阶段提交时间") + private Date partnerSubmitTime; + + @ApiModelProperty("所属阶段") + private String workflowStage; + + @ApiModelProperty("子流程状态") + private String workflowStatus; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerInterviewInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerInterviewInfoDTO.java new file mode 100644 index 000000000..43c933dd9 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerInterviewInfoDTO.java @@ -0,0 +1,64 @@ +package com.cool.store.dto.partner; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author suzhuhong + * @Date 2023/6/9 19:40 + * @Version 1.0 + */ +@Data +public class PartnerInterviewInfoDTO { + + @ApiModelProperty("hy_partner_interview.id") + private Long interviewId; + + @ApiModelProperty("hy_partner_interview_plan.id") + private Long id; + + @ApiModelProperty("加盟商用户名称") + private String partnerUserName; + + @ApiModelProperty("预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝") + private Integer status; + + @ApiModelProperty("hy_partner_line_info.id") + private Long partnerLineId; + + @ApiModelProperty("加盟商用户ID") + private String partnerId; + + @ApiModelProperty("截止时间") + private Date deadline; + + @ApiModelProperty("审批发起时间") + private Date approveTime; + + @ApiModelProperty("意向合同号") + private String authCode; + + @ApiModelProperty("面试开始时间") + private Date startTime; + + @ApiModelProperty("面试结束时间") + private Date endTime; + + @ApiModelProperty("面试官ID") + private String interviewer; + + @ApiModelProperty("面试官名称") + private String interviewerName; + + @ApiModelProperty("预约时间") + private Date createTime; + + @ApiModelProperty("房间号") + private String roomId; + + @ApiModelProperty("过程信息") + private String processInfo; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java new file mode 100644 index 000000000..deba8335e --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java @@ -0,0 +1,44 @@ +package com.cool.store.dto.partner; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2023/6/12 16:05 + * @Version 1.0 + */ +@Data +public class PartnerLineInfoAndBaseInfoDTO { + @ApiModelProperty("线索ID") + private Long id; + + @ApiModelProperty("hy_partner_user_info.partner_id") + private String partnerId; + + @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同") + private String workflowStage; + + @ApiModelProperty("流程子状态") + private String workflowStatus; + + @ApiModelProperty("加盟商用户ID") + private String partnerUserId; + + @ApiModelProperty("加盟商用户名称") + private String partnerUserName; + + @ApiModelProperty("加盟商用户手机号") + private String partnerUserPhone; + + @ApiModelProperty("手机号归属地") + private String phoneAddress; + + @ApiModelProperty("招商经理") + private String investmentManager; + + @ApiModelProperty("招商经理手机号") + private String investmentManagerPhone; + @ApiModelProperty("用户画像") + private String userPortrait; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/SpecialDateRangeInterviewCountDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/SpecialDateRangeInterviewCountDTO.java new file mode 100644 index 000000000..fd311757d --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/SpecialDateRangeInterviewCountDTO.java @@ -0,0 +1,17 @@ +package com.cool.store.dto.partner; + +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2023/6/8 16:38 + * @Version 1.0 + */ +@Data +public class SpecialDateRangeInterviewCountDTO { + + private Integer currentDayInterviewCount; + + private Integer lastSevenDayInterviewCount; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/StageCountDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/StageCountDTO.java new file mode 100644 index 000000000..f3f7bd017 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/StageCountDTO.java @@ -0,0 +1,38 @@ +package com.cool.store.dto.partner; + +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2023/6/9 10:16 + * @Version 1.0 + */ +@Data +public class StageCountDTO { + /** + * 意向申请待处理或者待跟进数量 + */ + private Integer intentApplyApproveCount; + /** + * 预约面试阶段 待跟进数量 + */ + private Integer reservationInterviewCount; + /** + * 合格资格面试 待处理或者待跟进数量 + */ + private Integer qualifiedInterviewCount; + + public StageCountDTO(Integer intentApplyApproveCount, Integer reservationInterviewCount, Integer qualifiedInterviewCount) { + this.intentApplyApproveCount = intentApplyApproveCount; + this.reservationInterviewCount = reservationInterviewCount; + this.qualifiedInterviewCount = qualifiedInterviewCount; + } + + public StageCountDTO(Integer intentApplyApproveCount, Integer qualifiedInterviewCount) { + this.intentApplyApproveCount = intentApplyApproveCount; + this.qualifiedInterviewCount = qualifiedInterviewCount; + } + + public StageCountDTO() { + } +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/TransferInvestmentManagerRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/TransferInvestmentManagerRequest.java new file mode 100644 index 000000000..76e60a429 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/TransferInvestmentManagerRequest.java @@ -0,0 +1,21 @@ +package com.cool.store.request; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/5/30 21:22 + * @Version 1.0 + */ +@Data +@ApiModel +public class TransferInvestmentManagerRequest { + + private Long lineId; + + private String userId; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewDetailInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewDetailInfoVO.java new file mode 100644 index 000000000..039399536 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewDetailInfoVO.java @@ -0,0 +1,27 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author suzhuhong + * @Date 2023/6/8 16:12 + * @Version 1.0 + */ +@Data +@ApiModel +public class InterviewDetailInfoVO { + @ApiModelProperty("面试者ID") + private String userId; + @ApiModelProperty("面试者名称") + private String userName; + @ApiModelProperty("面试者手机号") + private String userPhone; + @ApiModelProperty("线索ID") + private Long lineId; + @ApiModelProperty("面试开始时间") + private Date startTime; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewPlanVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewPlanVO.java new file mode 100644 index 000000000..eb951a7b9 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewPlanVO.java @@ -0,0 +1,20 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2023/6/8 14:39 + * @Version 1.0 + */ +@Data +@ApiModel +public class InterviewPlanVO { + + private Boolean hasInterview; + + private Boolean hasAdventLine; + + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewScheduleInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewScheduleInfoVO.java index 3545b4d89..df1acec7f 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewScheduleInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewScheduleInfoVO.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.List; /** * @Author suzhuhong @@ -19,15 +20,7 @@ public class InterviewScheduleInfoVO { private Integer currentDayInterviewCount; @ApiModelProperty("当前日期后七天面试数量") private Integer lastSevenDayInterviewCount; - @ApiModelProperty("面试者ID") - private String userId; - @ApiModelProperty("面试者名称") - private String userName; - @ApiModelProperty("面试者手机号") - private String userPhone; - @ApiModelProperty("线索ID") - private Long lineId; - @ApiModelProperty("面试开始时间") - private Date startTime; + @ApiModelProperty("面试日程列表") + private List interviewDetailInfoVOS; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java index 69cced4ba..75703825d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java @@ -6,6 +6,7 @@ import lombok.Data; import java.util.Date; + /** * @Author suzhuhong * @Date 2023/5/30 20:11 @@ -22,6 +23,9 @@ public class PartnerIntentApplyInfoVO { @ApiModelProperty("加盟商用户名称") private String partnerUserName; + @ApiModelProperty("加盟商手机号码") + private String partnerUserPhone; + @ApiModelProperty("hy_partner_user_info.partner_id") private String partnerId; @@ -34,6 +38,9 @@ public class PartnerIntentApplyInfoVO { @ApiModelProperty("意向开店区域") private String wantShopArea; + @ApiModelProperty("意向开店区域") + private String wantShopAreaName; + @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") private Integer acceptAdjustType; @@ -43,7 +50,4 @@ public class PartnerIntentApplyInfoVO { @ApiModelProperty("阶段提交时间") private Date partnerSubmitTime; - - - } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java index 50ec23725..fd785a449 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @Author suzhuhong * @Date 2023/5/30 20:28 @@ -14,7 +16,7 @@ import lombok.Data; public class PartnerInterviewInfoVO { @ApiModelProperty("会议id") - private String interviewId; + private Long interviewId; @ApiModelProperty("预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝") private Integer status; @@ -40,4 +42,9 @@ public class PartnerInterviewInfoVO { @ApiModelProperty("面试官名称") private String interviewerName; + @ApiModelProperty("预约时间") + private String createTime; + + @ApiModelProperty("过程信息") + private String processInfo; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java similarity index 90% rename from coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineDetailVO.java rename to coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java index 2da1ce719..9bacd830b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineDetailVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java @@ -13,14 +13,11 @@ import java.util.List; */ @Data @ApiModel -public class PartnerLineDetailVO { +public class PartnerLineInfoAndBaseInfoVO { @ApiModelProperty("线索ID") private Long id; - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同") private String workflowStage; @@ -42,13 +39,11 @@ public class PartnerLineDetailVO { @ApiModelProperty("招商经理") private String investmentManager; + @ApiModelProperty("招商经理") + private String investmentManagerName; + @ApiModelProperty("招商经理手机号") private String investmentManagerPhone; @ApiModelProperty("用户画像") private String userPortrait; - - - - - } diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/Service/DeskService.java b/coolstore-partner-webb/src/main/java/com/cool/store/Service/DeskService.java new file mode 100644 index 000000000..f245f0bab --- /dev/null +++ b/coolstore-partner-webb/src/main/java/com/cool/store/Service/DeskService.java @@ -0,0 +1,49 @@ +package com.cool.store.Service; + +import com.cool.store.vo.InterviewPlanVO; +import com.cool.store.vo.InterviewScheduleInfoVO; +import com.cool.store.vo.StageCountVO; + +import java.util.Date; + +/** + * @Author suzhuhong + * @Date 2023/6/8 14:45 + * @Version 1.0 + */ +public interface DeskService { + + + /** + * 是否有临期线索与面试 + * @param userId + * @return + */ + InterviewPlanVO getInterviewPlan(String userId); + + + /** + * 面试日程 + * @param userId + * @param selectedData + * @return + */ + InterviewScheduleInfoVO interviewSchedule(String userId,Date selectedData); + + /** + * 招商经理 各阶段 待处理 待跟进数量 + * @param userId + * @param type + * @return + */ + StageCountVO getStageCountByType(String userId,String type); + + + + + + + + + +} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/Service/HyPartnerIntentInfoService.java b/coolstore-partner-webb/src/main/java/com/cool/store/Service/HyPartnerIntentInfoService.java new file mode 100644 index 000000000..1a17a53e1 --- /dev/null +++ b/coolstore-partner-webb/src/main/java/com/cool/store/Service/HyPartnerIntentInfoService.java @@ -0,0 +1,31 @@ +package com.cool.store.Service; + +import com.cool.store.vo.PartnerIntentApplyInfoVO; +import com.github.pagehelper.PageInfo; + +/** + * @Author suzhuhong + * @Date 2023/6/9 14:54 + * @Version 1.0 + */ +public interface HyPartnerIntentInfoService { + + + /** + * 招商经理 意向申请阶段 待处理 待跟进列表 + * @param userId + * @param type + * @param pageSize + * @param pageNumber + * @return + */ + PageInfo getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber); + + /** + * 根据线索查询加盟商意向申请信息 + * @param lineId + * @return + */ + PartnerIntentApplyInfoVO getPartnerIntentApplyInfo(Long lineId); + +} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/Service/HyPartnerInterviewPlanService.java b/coolstore-partner-webb/src/main/java/com/cool/store/Service/HyPartnerInterviewPlanService.java new file mode 100644 index 000000000..f037111bb --- /dev/null +++ b/coolstore-partner-webb/src/main/java/com/cool/store/Service/HyPartnerInterviewPlanService.java @@ -0,0 +1,45 @@ +package com.cool.store.Service; + +import com.cool.store.entity.HyPartnerInterviewPlanDO; +import com.cool.store.vo.InterviewDetailInfoVO; +import com.cool.store.vo.PartnerInterviewInfoVO; +import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/6/8 19:32 + * @Version 1.0 + */ +public interface HyPartnerInterviewPlanService { + + /** + * 招商经理今日面试列表 + * @param userId + * @return + */ + List getInterviewPlanList(String userId); + + /** + * getPartnerInterviewInfoList + * @param userId + * @param pageSize + * @param pageNumber + * @return + */ + PageInfo getPartnerInterviewInfoList(String userId,Integer pageSize,Integer pageNumber); + + + /** + * getQualifiedInterviewList + * @param userId + * @param type + * @param pageSize + * @param pageNumber + * @return + */ + PageInfo getQualifiedInterviewList(String userId,String type,Integer pageSize,Integer pageNumber); +} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/Service/HyPartnerLineInfoService.java b/coolstore-partner-webb/src/main/java/com/cool/store/Service/HyPartnerLineInfoService.java new file mode 100644 index 000000000..c3ffcb52b --- /dev/null +++ b/coolstore-partner-webb/src/main/java/com/cool/store/Service/HyPartnerLineInfoService.java @@ -0,0 +1,67 @@ +package com.cool.store.Service; + +import com.cool.store.vo.PartnerLineInfoAndBaseInfoVO; +import com.cool.store.vo.PartnerLineInfoVO; +import com.cool.store.vo.StageCountVO; +import com.github.pagehelper.PageInfo; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/6/9 10:30 + * @Version 1.0 + */ +public interface HyPartnerLineInfoService { + + + /** + * 查询招商经理 待处理 + * @param userId + * @return + */ + StageCountVO selectStagePendingCount(String userId); + + /** + * 查询招商经理 待跟进 + * @param userId + * @return + */ + StageCountVO selectStageFollowCount(String userId); + + + /** + * 查询加盟商线索详情之一 线索信息与基本信息 + * @param lineId + * @return + */ + PartnerLineInfoAndBaseInfoVO selectPartnerLineInfoAndBaseInfo(Long lineId); + + /** + * 最近30天结束的线索 + * @param userId + * @param pageSize + * @param pageNumber + * @return + */ + PageInfo lastMonthCloseLine(String userId,Integer pageSize,Integer pageNumber); + + /** + * 转让招商经理 + * @param userId + * @param lineId + * @return + */ + Boolean transferInvestmentManager(String userId,Long lineId); + + /** + * 分配招商经理 + * @param userId + * @param lineIdList + * @return + */ + Boolean allocationInvestmentManager(String userId, List lineIdList); + + + +} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/Service/impl/DeskServiceImpl.java b/coolstore-partner-webb/src/main/java/com/cool/store/Service/impl/DeskServiceImpl.java new file mode 100644 index 000000000..c769b8c78 --- /dev/null +++ b/coolstore-partner-webb/src/main/java/com/cool/store/Service/impl/DeskServiceImpl.java @@ -0,0 +1,92 @@ +package com.cool.store.Service.impl; + +import cn.hutool.core.date.DateUtil; +import com.cool.store.Service.DeskService; +import com.cool.store.Service.HyPartnerInterviewPlanService; +import com.cool.store.Service.HyPartnerLineInfoService; +import com.cool.store.constants.CommonConstants; +import com.cool.store.dao.HyPartnerInterviewPlanDAO; +import com.cool.store.dao.HyPartnerLineInfoDAO; +import com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO; +import com.cool.store.entity.HyPartnerInterviewPlanDO; +import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.exception.ServiceException; +import com.cool.store.utils.CoolDateUtils; +import com.cool.store.vo.InterviewDetailInfoVO; +import com.cool.store.vo.InterviewPlanVO; +import com.cool.store.vo.InterviewScheduleInfoVO; +import com.cool.store.vo.StageCountVO; +import org.apache.commons.lang3.StringUtils; +import org.apache.http.client.utils.DateUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/6/8 14:45 + * @Version 1.0 + */ +@Service +public class DeskServiceImpl implements DeskService { + + @Resource + HyPartnerInterviewPlanDAO hyPartnerInterviewPlanDAO; + @Resource + HyPartnerLineInfoDAO hyPartnerLineInfoDAO; + @Resource + HyPartnerInterviewPlanService hyPartnerInterviewPlanService; + @Resource + HyPartnerLineInfoService hyPartnerLineInfoService; + + @Override + public InterviewPlanVO getInterviewPlan(String userId) { + InterviewPlanVO interviewPlanVO = new InterviewPlanVO(); + + String currentDate = DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_DAY); + Integer currentDateInterviewCount = hyPartnerInterviewPlanDAO.getCurrentDateInterviewCount(userId, currentDate); + interviewPlanVO.setHasInterview(currentDateInterviewCount>0); + //临期数量 + Integer adventLineCount = hyPartnerLineInfoDAO.getAdventLineCount(userId, currentDate); + interviewPlanVO.setHasAdventLine(adventLineCount>0); + return interviewPlanVO; + } + + @Override + public InterviewScheduleInfoVO interviewSchedule(String userId,Date selectedData) { + if (StringUtils.isEmpty(userId)||selectedData==null){ + throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); + } + InterviewScheduleInfoVO interviewScheduleInfoVO = new InterviewScheduleInfoVO(); + //查询面试数量 + String currentDate = DateUtil.format(selectedData, CoolDateUtils.DATE_FORMAT_DAY); + String startTime = DateUtil.format(selectedData, CoolDateUtils.DATE_FORMAT_SEC); + String endTime = DateUtil.format(CoolDateUtils.getDateBefore(selectedData, 7), CoolDateUtils.DATE_FORMAT_SEC); + SpecialDateRangeInterviewCountDTO interviewCount = hyPartnerInterviewPlanDAO.getInterviewCount(userId, currentDate, startTime, endTime); + + interviewScheduleInfoVO.setCurrentDayInterviewCount(interviewCount.getCurrentDayInterviewCount()); + interviewScheduleInfoVO.setLastSevenDayInterviewCount(interviewCount.getLastSevenDayInterviewCount()); + + //查询面试列表 + //当天时间 与入参无关 + List interviewPlanList = hyPartnerInterviewPlanService.getInterviewPlanList(userId); + interviewScheduleInfoVO.setInterviewDetailInfoVOS(interviewPlanList); + + return interviewScheduleInfoVO; + } + + @Override + public StageCountVO getStageCountByType(String userId, String type) { + if (CommonConstants.PENDING.equals(type)){ + return hyPartnerLineInfoService.selectStagePendingCount(userId); + } + if (CommonConstants.FOLLOW.equals(type)){ + return hyPartnerLineInfoService.selectStageFollowCount(userId); + } + return null; + } + + +} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/Service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-webb/src/main/java/com/cool/store/Service/impl/HyPartnerIntentInfoServiceImpl.java new file mode 100644 index 000000000..8a947b300 --- /dev/null +++ b/coolstore-partner-webb/src/main/java/com/cool/store/Service/impl/HyPartnerIntentInfoServiceImpl.java @@ -0,0 +1,104 @@ +package com.cool.store.Service.impl; + +import com.cool.store.Service.HyPartnerIntentInfoService; +import com.cool.store.constants.CommonConstants; +import com.cool.store.dao.HyPartnerIntentInfoDAO; +import com.cool.store.dao.HyPartnerLineInfoDAO; +import com.cool.store.dao.HyPartnerUserInfoDAO; +import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO; +import com.cool.store.entity.HyPartnerIntentInfoDO; +import com.cool.store.entity.HyPartnerLineInfoDO; +import com.cool.store.entity.HyPartnerUserInfoDO; +import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.WorkflowStageEnum; +import com.cool.store.enums.WorkflowStatusEnum; +import com.cool.store.exception.ServiceException; +import com.cool.store.vo.PartnerIntentApplyInfoVO; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @Author suzhuhong + * @Date 2023/6/9 15:00 + * @Version 1.0 + */ +@Service +public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoService { + + + @Resource + HyPartnerIntentInfoDAO hyPartnerIntentInfoDAO; + @Resource + HyPartnerUserInfoDAO hyPartnerUserInfoDAO; + @Resource + HyPartnerLineInfoDAO hyPartnerLineInfoDAO; + + @Override + public PageInfo getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber) { + PartnerIntentApplyInfoVO partnerIntentApplyInfoVO = new PartnerIntentApplyInfoVO(); + String workflowStatus = ""; + if (CommonConstants.PENDING.equals(type)) { + workflowStatus = WorkflowStatusEnum.RESERVATION_0.getCode(); + } + if (CommonConstants.FOLLOW.equals(type)) { + workflowStatus = WorkflowStatusEnum.INTERVIEW_4.getCode(); + } + PageHelper.startPage(pageNumber,pageSize); + PageInfo partnerIntentApplyInfo = hyPartnerIntentInfoDAO.selectPartnerIntentApplyInfoList(userId, WorkflowStageEnum.INTENT.getCode(), workflowStatus); + if (partnerIntentApplyInfo==null){ + return new PageInfo<>(); + } + List list = partnerIntentApplyInfo.getList(); + List partnerIds = list.stream().map(PartnerIntentApplyInfoDTO::getPartnerId).collect(Collectors.toList()); + List hyPartnerUserInfoDOS = hyPartnerUserInfoDAO.selectByPartnerIds(partnerIds); + Map infoDOMap = hyPartnerUserInfoDOS.stream().collect(Collectors.toMap(HyPartnerUserInfoDO::getPartnerId, data -> data)); + List result = new ArrayList<>(); + list.stream().forEach(x->{ + PartnerIntentApplyInfoVO pat = partnerIntentApplyInfoDTOToVo(x); + HyPartnerUserInfoDO infoDOMapOrDefault = infoDOMap.getOrDefault(x.getPartnerId(), new HyPartnerUserInfoDO()); + pat.setPartnerUserName(infoDOMapOrDefault.getUsername()); + pat.setPartnerUserPhone(infoDOMapOrDefault.getMobile()); + result.add(pat); + }); + partnerIntentApplyInfo.setList(result); + return partnerIntentApplyInfo; + } + + @Override + public PartnerIntentApplyInfoVO getPartnerIntentApplyInfo(Long lineId) { + PartnerIntentApplyInfoDTO partnerIntentApplyInfoDTO= hyPartnerIntentInfoDAO.selectByLineId(lineId); + PartnerIntentApplyInfoVO partnerIntentApplyInfoVO = partnerIntentApplyInfoDTOToVo(partnerIntentApplyInfoDTO); + HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(partnerIntentApplyInfoDTO.getPartnerId()); + partnerIntentApplyInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername()); + partnerIntentApplyInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile()); + //todo su 手机号归属地 意向申请区域名称 + return partnerIntentApplyInfoVO; + } + + /** + * partnerIntentApplyInfoDTOToVo + * @param partnerIntentApplyInfoDTO + * @return + */ + private PartnerIntentApplyInfoVO partnerIntentApplyInfoDTOToVo(PartnerIntentApplyInfoDTO partnerIntentApplyInfoDTO){ + PartnerIntentApplyInfoVO partnerIntentApplyInfoVO = new PartnerIntentApplyInfoVO(); + partnerIntentApplyInfoVO.setId(partnerIntentApplyInfoDTO.getId()); + partnerIntentApplyInfoVO.setPartnerId(partnerIntentApplyInfoDTO.getPartnerId()); + partnerIntentApplyInfoVO.setPartnerLineId(partnerIntentApplyInfoDTO.getPartnerLineId()); + partnerIntentApplyInfoVO.setPartnerSubmitTime(partnerIntentApplyInfoDTO.getPartnerSubmitTime()); + partnerIntentApplyInfoVO.setAcceptAdjustType(partnerIntentApplyInfoDTO.getAcceptAdjustType()); + partnerIntentApplyInfoVO.setLiveArea(partnerIntentApplyInfoDTO.getLiveArea()); + partnerIntentApplyInfoVO.setWantShopArea(partnerIntentApplyInfoDTO.getWantShopArea()); + partnerIntentApplyInfoVO.setDeadline(partnerIntentApplyInfoDTO.getDeadline()); + return partnerIntentApplyInfoVO; + } + + +} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/Service/impl/HyPartnerInterviewPlanServiceImpl.java b/coolstore-partner-webb/src/main/java/com/cool/store/Service/impl/HyPartnerInterviewPlanServiceImpl.java new file mode 100644 index 000000000..fac20b4c9 --- /dev/null +++ b/coolstore-partner-webb/src/main/java/com/cool/store/Service/impl/HyPartnerInterviewPlanServiceImpl.java @@ -0,0 +1,141 @@ +package com.cool.store.Service.impl; + +import cn.hutool.core.date.DateUtil; +import com.cool.store.Service.HyPartnerInterviewPlanService; +import com.cool.store.constants.CommonConstants; +import com.cool.store.dao.HyPartnerInterviewPlanDAO; +import com.cool.store.dao.HyPartnerUserInfoDAO; +import com.cool.store.dto.partner.PartnerInterviewInfoDTO; +import com.cool.store.entity.HyPartnerInterviewPlanDO; +import com.cool.store.entity.HyPartnerUserInfoDO; +import com.cool.store.enums.WorkflowStageEnum; +import com.cool.store.enums.WorkflowStatusEnum; +import com.cool.store.utils.CoolDateUtils; +import com.cool.store.vo.InterviewDetailInfoVO; +import com.cool.store.vo.PartnerInterviewInfoVO; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @Author suzhuhong + * @Date 2023/6/8 19:32 + * @Version 1.0 + */ +@Service +public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlanService { + + @Resource + HyPartnerInterviewPlanDAO hyPartnerInterviewPlanDAO; + @Resource + HyPartnerUserInfoDAO hyPartnerUserInfoDAO; + + + @Override + public List getInterviewPlanList(String userId) { + String currentTime = DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_DAY); + List interviewPlanList = hyPartnerInterviewPlanDAO.getInterviewPlanList(userId, currentTime); + if (CollectionUtils.isEmpty(interviewPlanList)){ + return Lists.newArrayList(); + } + List partnerIdList = interviewPlanList.stream().map(HyPartnerInterviewPlanDO::getPartnerId).collect(Collectors.toList()); + List hyPartnerUserInfoDOS = hyPartnerUserInfoDAO.selectByPartnerIds(partnerIdList); + Map hyPartnerUserInfoDOMap = hyPartnerUserInfoDOS.stream().collect(Collectors.toMap(HyPartnerUserInfoDO::getPartnerId, data -> data)); + List result = new ArrayList<>(); + interviewPlanList.stream().forEach(x->{ + InterviewDetailInfoVO interviewDetailInfoVO = convertDoToInterviewDetailInfoVO(x); + HyPartnerUserInfoDO userInfoDO = hyPartnerUserInfoDOMap.getOrDefault(x.getPartnerId(), new HyPartnerUserInfoDO()); + interviewDetailInfoVO.setUserId(userInfoDO.getPartnerId()); + interviewDetailInfoVO.setUserName(userInfoDO.getUsername()); + interviewDetailInfoVO.setUserPhone(userInfoDO.getMobile()); + result.add(interviewDetailInfoVO); + }); + return result; + } + + @Override + public PageInfo getPartnerInterviewInfoList(String userId ,Integer pageSize,Integer pageNumber) { + PageHelper.startPage(pageNumber,pageSize); + //查询预约面试列表 + PageInfo partnerInterviewInfoList = hyPartnerInterviewPlanDAO.getPartnerInterviewInfoList(userId, WorkflowStageEnum.RESERVATION.getCode(), WorkflowStatusEnum.RESERVATION_0.getCode()); + List list = partnerInterviewInfoList.getList(); + if (CollectionUtils.isEmpty(list)){ + return partnerInterviewInfoList; + } + List result = new ArrayList<>(); + list.stream().forEach(x->{ + PartnerInterviewInfoVO partnerInterviewInfoVO = convertPartnerInterviewInfoDTOToVo(x); + result.add(partnerInterviewInfoVO); + }); + partnerInterviewInfoList.setList(result); + return partnerInterviewInfoList; + } + + @Override + public PageInfo getQualifiedInterviewList(String userId, String type, Integer pageSize, Integer pageNumber) { + String workflowStatus = ""; + if (CommonConstants.PENDING.equals(type)) { + workflowStatus = WorkflowStatusEnum.INTERVIEW_3.getCode(); + } + if (CommonConstants.FOLLOW.equals(type)) { + workflowStatus = WorkflowStatusEnum.INTERVIEW_4.getCode(); + } + + PageHelper.startPage(pageNumber,pageSize); + //查询预约面试列表 + PageInfo partnerInterviewInfoList = hyPartnerInterviewPlanDAO.getPartnerInterviewInfoList(userId, WorkflowStageEnum.INTERVIEW.getCode(),workflowStatus); + List list = partnerInterviewInfoList.getList(); + if (CollectionUtils.isEmpty(list)){ + return partnerInterviewInfoList; + } + List result = new ArrayList<>(); + list.stream().forEach(x->{ + PartnerInterviewInfoVO partnerInterviewInfoVO = convertPartnerInterviewInfoDTOToVo(x); + result.add(partnerInterviewInfoVO); + }); + partnerInterviewInfoList.setList(result); + return partnerInterviewInfoList; + } + + + /** + * convertDoToInterviewDetailInfoVO + * @param hyPartnerInterviewPlanDO + * @return + */ + private InterviewDetailInfoVO convertDoToInterviewDetailInfoVO(HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO){ + InterviewDetailInfoVO interviewDetailInfoVO = new InterviewDetailInfoVO(); + if (hyPartnerInterviewPlanDO==null){ + return interviewDetailInfoVO; + } + interviewDetailInfoVO.setLineId(hyPartnerInterviewPlanDO.getPartnerLineId()); + interviewDetailInfoVO.setStartTime(hyPartnerInterviewPlanDO.getStartTime()); + return interviewDetailInfoVO; + } + + /** + * PartnerInterviewInfoDTOToVo + * @param partnerInterviewInfoDTO + * @return + */ + private PartnerInterviewInfoVO convertPartnerInterviewInfoDTOToVo(PartnerInterviewInfoDTO partnerInterviewInfoDTO){ + PartnerInterviewInfoVO partnerInterviewInfoVO = new PartnerInterviewInfoVO(); + partnerInterviewInfoVO.setInterviewId(partnerInterviewInfoDTO.getInterviewId()); + partnerInterviewInfoVO.setPartnerId(partnerInterviewInfoDTO.getPartnerId()); + partnerInterviewInfoVO.setInterviewerId(partnerInterviewInfoDTO.getInterviewer()); + partnerInterviewInfoVO.setProcessInfo(partnerInterviewInfoDTO.getProcessInfo()); + partnerInterviewInfoVO.setCreateTime(DateUtil.format(partnerInterviewInfoDTO.getCreateTime(),CoolDateUtils.DATE_FORMAT_SEC)); + partnerInterviewInfoVO.setRoomId(partnerInterviewInfoDTO.getRoomId()); + partnerInterviewInfoVO.setStartTime(DateUtil.format(partnerInterviewInfoDTO.getStartTime(),CoolDateUtils.DATE_FORMAT_SEC)); + partnerInterviewInfoVO.setStatus(partnerInterviewInfoDTO.getStatus()); + partnerInterviewInfoVO.setEndTime(DateUtil.format(partnerInterviewInfoDTO.getEndTime(),CoolDateUtils.DATE_FORMAT_SEC)); + return partnerInterviewInfoVO; + } + +} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/Service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-webb/src/main/java/com/cool/store/Service/impl/HyPartnerLineInfoServiceImpl.java new file mode 100644 index 000000000..67580e4f4 --- /dev/null +++ b/coolstore-partner-webb/src/main/java/com/cool/store/Service/impl/HyPartnerLineInfoServiceImpl.java @@ -0,0 +1,163 @@ +package com.cool.store.Service.impl; + +import cn.hutool.core.date.DateUtil; +import com.cool.store.Service.HyPartnerLineInfoService; +import com.cool.store.dao.HyPartnerLineInfoDAO; +import com.cool.store.dao.HyPartnerUserInfoDAO; +import com.cool.store.dto.partner.PartnerLineInfoAndBaseInfoDTO; +import com.cool.store.dto.partner.StageCountDTO; +import com.cool.store.entity.HyPartnerLineInfoDO; +import com.cool.store.entity.HyPartnerUserInfoDO; +import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.WorkflowStageEnum; +import com.cool.store.enums.WorkflowStatusEnum; +import com.cool.store.exception.ServiceException; +import com.cool.store.utils.CoolDateUtils; +import com.cool.store.utils.StringUtil; +import com.cool.store.vo.PartnerLineInfoAndBaseInfoVO; +import com.cool.store.vo.PartnerLineInfoVO; +import com.cool.store.vo.StageCountVO; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @Author suzhuhong + * @Date 2023/6/9 10:30 + * @Version 1.0 + */ +@Service +public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { + + @Resource + HyPartnerLineInfoDAO hyPartnerLineInfoDAO; + @Resource + HyPartnerUserInfoDAO hyPartnerUserInfoDAO; + + @Override + public StageCountVO selectStagePendingCount(String userId) { + StageCountDTO stageCountDTO = hyPartnerLineInfoDAO.selectStagePendingCount(userId); + return stageCountDTOToVo(stageCountDTO); + } + + @Override + public StageCountVO selectStageFollowCount(String userId) { + StageCountDTO stageCountDTO = hyPartnerLineInfoDAO.selectStageFollowCount(userId); + return stageCountDTOToVo(stageCountDTO); + } + + @Override + public PartnerLineInfoAndBaseInfoVO selectPartnerLineInfoAndBaseInfo(Long lineId) { + PartnerLineInfoAndBaseInfoDTO partnerLineInfoAndBaseInfoDTO = hyPartnerLineInfoDAO.selectPartnerLineInfoAndBaseInfo(lineId); + if (partnerLineInfoAndBaseInfoDTO==null){ + throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); + } + PartnerLineInfoAndBaseInfoVO partnerLineInfoAndBaseInfoVO = convertPartnerLineInfoAndBaseInfoDTOToVo(partnerLineInfoAndBaseInfoDTO); + HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(partnerLineInfoAndBaseInfoVO.getPartnerUserId()); + if (hyPartnerUserInfoDO!=null){ + partnerLineInfoAndBaseInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername()); + partnerLineInfoAndBaseInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile()); + } + //todo su 1、招商经理名称 手机号归属地 2、加盟商手机号归属地 + return partnerLineInfoAndBaseInfoVO; + } + + @Override + public PageInfo lastMonthCloseLine(String userId, Integer pageSize, Integer pageNumber) { + PageHelper.startPage(pageNumber,pageSize); + String lastMonthTodayDate = DateUtil.format(CoolDateUtils.getDateBefore(new Date(),-30), CoolDateUtils.DATE_FORMAT_SEC); + PageInfo hyPartnerLineInfoDOPageInfo = hyPartnerLineInfoDAO.lastMonthCloseLine(userId, lastMonthTodayDate); + + List list = hyPartnerLineInfoDOPageInfo.getList(); + List result = new ArrayList<>(); + list.stream().forEach(x->{ + PartnerLineInfoVO partnerLineInfoVO = new PartnerLineInfoVO(); + BeanUtils.copyProperties(x,partnerLineInfoVO); + result.add(partnerLineInfoVO); + }); + hyPartnerLineInfoDOPageInfo.setList(result); + return hyPartnerLineInfoDOPageInfo; + } + + @Override + public Boolean transferInvestmentManager(String userId, Long lineId) { + if (StringUtil.isBlank(userId)||lineId==null){ + throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); + } + hyPartnerLineInfoDAO.updateInvestmentManager(userId, Arrays.asList(lineId)); + return Boolean.TRUE; + } + + @Override + public Boolean allocationInvestmentManager(String userId, List lineIdList) { + if (StringUtil.isBlank(userId)|| CollectionUtils.isEmpty(lineIdList)){ + throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); + } + //加盟上线索集合 + List partnerLineInfoList= hyPartnerLineInfoDAO.getLineListByLineIds(lineIdList); + //过滤出已结束的线索 这块线索需要重新生成新的线索 + List closeLineList = partnerLineInfoList.stream().filter(x -> x.getCloseTime() != null).collect(Collectors.toList()); + List closeLineIdList = closeLineList.stream().map(HyPartnerLineInfoDO::getId).collect(Collectors.toList()); + //已结束的线索 需要重新生成一条新的线索 + List list = new ArrayList<>(); + closeLineList.stream().forEach(x->{ + HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO(); + hyPartnerLineInfoDO.setPartnerId(x.getPartnerId()); + hyPartnerLineInfoDO.setInvestmentManager(userId); + hyPartnerLineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); + hyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode()); + hyPartnerLineInfoDO.setLineStatus(1); + list.add(hyPartnerLineInfoDO); + }); + hyPartnerLineInfoDAO.batchInsert(list); + //将老的线索置为删除状态 + hyPartnerLineInfoDAO.batchDeleted(closeLineIdList); + //没有结束的线索直接分配招商经理 + List otherLineList = partnerLineInfoList.stream().filter(x -> x.getCloseTime() == null).collect(Collectors.toList()); + List otherLineIdList = otherLineList.stream().map(HyPartnerLineInfoDO::getId).collect(Collectors.toList()); + hyPartnerLineInfoDAO.updateInvestmentManager(userId, otherLineIdList); + + return null; + } + + + /** + * convertPartnerLineInfoAndBaseInfoDTOToVo + * @param partnerLineInfoAndBaseInfoDTO + * @return + */ + private PartnerLineInfoAndBaseInfoVO convertPartnerLineInfoAndBaseInfoDTOToVo(PartnerLineInfoAndBaseInfoDTO partnerLineInfoAndBaseInfoDTO){ + PartnerLineInfoAndBaseInfoVO partnerLineInfoAndBaseInfoVO = new PartnerLineInfoAndBaseInfoVO(); + partnerLineInfoAndBaseInfoVO.setId(partnerLineInfoAndBaseInfoDTO.getId()); + partnerLineInfoAndBaseInfoVO.setPartnerUserId(partnerLineInfoAndBaseInfoDTO.getPartnerId()); + partnerLineInfoAndBaseInfoVO.setInvestmentManager(partnerLineInfoAndBaseInfoDTO.getInvestmentManager()); + partnerLineInfoAndBaseInfoVO.setUserPortrait(partnerLineInfoAndBaseInfoDTO.getUserPortrait()); + partnerLineInfoAndBaseInfoVO.setWorkflowStage(partnerLineInfoAndBaseInfoDTO.getWorkflowStage()); + partnerLineInfoAndBaseInfoVO.setWorkflowStatus(partnerLineInfoAndBaseInfoDTO.getWorkflowStatus()); + return partnerLineInfoAndBaseInfoVO; + } + + + + /** + * stageCountDTOToVo + * @param stageCountDTO + * @return + */ + private StageCountVO stageCountDTOToVo(StageCountDTO stageCountDTO){ + StageCountVO stageCountVO = new StageCountVO(); + stageCountVO.setQualifiedInterviewCount(stageCountDTO.getQualifiedInterviewCount()); + stageCountVO.setIntentApplyApproveCount(stageCountDTO.getIntentApplyApproveCount()); + stageCountVO.setReservationInterviewCount(stageCountDTO.getReservationInterviewCount()); + return stageCountVO; + } +} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java index c44c7eff6..db46b3dd1 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java @@ -1,5 +1,9 @@ package com.cool.store.controller; +import com.cool.store.Service.DeskService; +import com.cool.store.Service.HyPartnerIntentInfoService; +import com.cool.store.Service.HyPartnerInterviewPlanService; +import com.cool.store.Service.HyPartnerLineInfoService; import com.cool.store.request.*; import com.cool.store.response.ResponseResult; import com.cool.store.vo.*; @@ -10,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.Date; import java.util.List; @@ -22,12 +27,22 @@ import java.util.List; @Slf4j public class DeskController { + @Resource + DeskService deskService; + @Resource + HyPartnerIntentInfoService hyPartnerIntentInfoService; + @Resource + HyPartnerInterviewPlanService hyPartnerInterviewPlanService; + @Resource + HyPartnerLineInfoService hyPartnerLineInfoService; + @GetMapping(path = "/interviewSchedule") @ApiOperation("面试日程信息 面试信息有限 不做分页") - public ResponseResult interviewSchedule(@RequestParam(value = "selectedData",required = false) Date selectedData){ + public ResponseResult interviewSchedule(@RequestParam(value = "userId",required = false) String userId, + @RequestParam(value = "selectedData",required = false) Date selectedData){ - return ResponseResult.success(); + return ResponseResult.success(deskService.interviewSchedule(userId,selectedData)); } @@ -36,9 +51,18 @@ public class DeskController { @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "类型 待处理-Pending 待跟进-follow", required = false), }) - public ResponseResult queryStageCount(@RequestParam(value = "type",required = false)Integer type){ + public ResponseResult queryStageCount(@RequestParam(value = "type",required = false)String type){ + String userId = ""; + return ResponseResult.success(deskService.getStageCountByType(userId,type)); + } - return ResponseResult.success(); + @GetMapping(path = "/queryInterviewPlan") + @ApiOperation("是否有面试与临期线索") + @ApiImplicitParams({ + @ApiImplicitParam(name = "userId", value = "招商经理ID", required = false), + }) + public ResponseResult queryInterviewPlanVO(@RequestParam(value = "userId",required = false)String userId){ + return ResponseResult.success(deskService.getInterviewPlan(userId)); } @@ -46,32 +70,46 @@ public class DeskController { @ApiOperation("招商经理视角===意向申请审核列表") @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "类型 待处理-Pending 待跟进-follow", required = false), + @ApiImplicitParam(name = "pageNumber", value = "1", required = false), + @ApiImplicitParam(name = "pageSize", value = "10", required = false), }) - public ResponseResult> queryIntentApplyList(@RequestParam(value = "type",required = false)Integer type){ - - return ResponseResult.success(); + public ResponseResult> queryIntentApplyList(@RequestParam(value = "type",required = false)String type, + @RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, + @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ + String userId = ""; + return ResponseResult.success(hyPartnerIntentInfoService.getPartnerIntentApplyList(userId,type,pageSize,pageNumber)); } @PostMapping(path = "/querySubscribeInterviewTimeList") - @ApiOperation("招商经理视角===预约面试时间/合格资格面试 列表") + @ApiOperation("招商经理视角===预约面试时间 列表") + public ResponseResult> querySubscribeInterviewTimeList(@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, + @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ + + String userId = ""; + return ResponseResult.success(hyPartnerInterviewPlanService.getPartnerInterviewInfoList(userId,pageSize,pageNumber)); + } + + @PostMapping(path = "/queryQualifiedInterviewList") + @ApiOperation("招商经理视角===合格资格面试 列表") @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "类型 待处理-Pending 待跟进-follow", required = false), }) - public ResponseResult> querySubscribeInterviewTimeList(@RequestParam(value = "type",required = false)Integer type){ - - return ResponseResult.success(); + public ResponseResult> queryQualifiedInterviewList(@RequestParam(value = "type",required = false)String type, + @RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, + @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ + String userId = ""; + return ResponseResult.success(hyPartnerInterviewPlanService.getQualifiedInterviewList(userId,type,pageSize,pageNumber)); } - @GetMapping(path = "/getPartnerLineDetail") - @ApiOperation("查询加盟商线索详情 线索信息与基本信息") + @GetMapping(path = "/getPartnerLineInfoAndBaseInfo") + @ApiOperation("查询加盟商线索详情之一 线索信息与基本信息") @ApiImplicitParams({ @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), }) - public ResponseResult getPartnerLineDetail(@RequestParam(value = "lineId",required = false)Long lineId){ - - return ResponseResult.success(); + public ResponseResult getPartnerLineInfoAndBaseInfo(@RequestParam(value = "lineId",required = false)Long lineId){ + return ResponseResult.success(hyPartnerLineInfoService.selectPartnerLineInfoAndBaseInfo(lineId)); } @@ -81,9 +119,7 @@ public class DeskController { @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), }) public ResponseResult getPartnerIntentInfo(@RequestParam(value = "lineId",required = false)Long lineId){ - - - return ResponseResult.success(); + return ResponseResult.success(hyPartnerIntentInfoService.getPartnerIntentApplyInfo(lineId)); } @@ -120,16 +156,23 @@ public class DeskController { public ResponseResult> lastMonthCloseLine(@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ - - return ResponseResult.success(); + String userId = ""; + return ResponseResult.success(hyPartnerLineInfoService.lastMonthCloseLine(userId,pageSize,pageNumber)); } @PostMapping(path = "/allocationInvestmentManager") - @ApiOperation("分配招商经理/转让招商经理") - public ResponseResult allocationInvestmentManager(@RequestBody AllocationInvestmentManagerRequest allocationInvestmentManagerRequest){ + @ApiOperation("分配招商经理/批量分配招商经理") + public ResponseResult allocationInvestmentManager(@RequestBody AllocationInvestmentManagerRequest request){ - return ResponseResult.success(); + return ResponseResult.success(hyPartnerLineInfoService.allocationInvestmentManager(request.getUserId(),request.getLineIdList())); + } + + + @PostMapping(path = "/transferInvestmentManager") + @ApiOperation("转让招商经理") + public ResponseResult transferInvestmentManager(@RequestBody TransferInvestmentManagerRequest request){ + return ResponseResult.success(hyPartnerLineInfoService.transferInvestmentManager(request.getUserId(),request.getLineId())); }