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

跟进次数

Browse Source
This commit is contained in:
苏竹红
2023-06-28 10:41:05 +08:00
parent dc4179d491
commit 8538565dc2
7 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java
View File

@@ -61,11 +61,11 @@ public class HyPartnerInterviewPlanDAO {
* @param currentDate * @param currentDate
* @return * @return
*/ */
public List<HyPartnerInterviewPlanDO> getInterviewPlanList(String userId, String currentDate){ public List<HyPartnerInterviewPlanDO> getInterviewPlanList(String userId, String currentTime,String currentDay){
if (StringUtils.isEmpty(userId)){ if (StringUtils.isEmpty(userId)){
return new ArrayList<>(); return new ArrayList<>();
} }
return hyPartnerInterviewPlanMapper.getInterviewPlanList(userId,currentDate); return hyPartnerInterviewPlanMapper.getInterviewPlanList(userId,currentTime,currentDay);
} }
/** /**

3
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java
View File

@@ -60,7 +60,8 @@ public interface HyPartnerInterviewPlanMapper {
* @return * @return
*/ */
List<HyPartnerInterviewPlanDO> getInterviewPlanList(@Param("userId") String userId, List<HyPartnerInterviewPlanDO> getInterviewPlanList(@Param("userId") String userId,
@Param("currentDate") String currentDate); @Param("currentTime") String currentTime,
@Param("currentDay") String currentDay);
/** /**
* 工作台 招商经理 预约面试时间 合格资格面试 列表 * 工作台 招商经理 预约面试时间 合格资格面试 列表

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

@@ -283,8 +283,8 @@
<if test="userId!=null and userId!=''"> <if test="userId!=null and userId!=''">
and interviewer = #{userId} and interviewer = #{userId}
</if> </if>
<if test="currentDate!=null and currentDate!=''"> <if test="currentDay!=null and currentDay!=''">
and interview_date = #{currentDate} and interview_date = #{currentDay}
</if> </if>
and (start_time>now() or (start_time<![CDATA[<]]>now() and room_status!=2)) and (start_time>now() or (start_time<![CDATA[<]]>now() and room_status!=2))
and application_approved = 1 and application_approved = 1

4
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java
View File

@@ -86,4 +86,8 @@ public class PartnerLineInfoAndBaseInfoVO {
@ApiModelProperty("线索来源名称") @ApiModelProperty("线索来源名称")
private String channelName; private String channelName;
private String education;
private String idCard;
} }

3
coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerInterviewPlanService.java
View File

@@ -4,6 +4,7 @@ import com.cool.store.vo.InterviewDetailInfoVO;
import com.cool.store.vo.PartnerInterviewInfoVO; import com.cool.store.vo.PartnerInterviewInfoVO;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@@ -18,7 +19,7 @@ public interface HyPartnerInterviewPlanService {
* @param userId * @param userId
* @return * @return
*/ */
List<InterviewDetailInfoVO> getInterviewPlanList(String userId); List<InterviewDetailInfoVO> getInterviewPlanList(String userId, Date dateTime);
/** /**
* getPartnerInterviewInfoList * getPartnerInterviewInfoList

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
View File

@@ -64,7 +64,7 @@ public class DeskServiceImpl implements DeskService {
InterviewScheduleInfoVO interviewScheduleInfoVO = new InterviewScheduleInfoVO(); InterviewScheduleInfoVO interviewScheduleInfoVO = new InterviewScheduleInfoVO();
//查询面试数量 //查询面试数量
String currentDate = DateUtil.format(dateTime, CoolDateUtils.DATE_FORMAT_SEC); String currentDate = DateUtil.format(dateTime, CoolDateUtils.DATE_FORMAT_DAY);
String startTime = DateUtil.format(CoolDateUtils.getDateFormatDayMinTime(1), 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); String endTime = DateUtil.format(CoolDateUtils.getDateFormatDay(7), CoolDateUtils.DATE_FORMAT_SEC);
SpecialDateRangeInterviewCountDTO interviewCount = hyPartnerInterviewPlanDAO.getInterviewCount(userId, currentDate, startTime, endTime); SpecialDateRangeInterviewCountDTO interviewCount = hyPartnerInterviewPlanDAO.getInterviewCount(userId, currentDate, startTime, endTime);
@@ -74,7 +74,7 @@ public class DeskServiceImpl implements DeskService {
//查询面试列表 //查询面试列表
//当天时间 与入参无关 //当天时间 与入参无关
List<InterviewDetailInfoVO> interviewPlanList = hyPartnerInterviewPlanService.getInterviewPlanList(userId); List<InterviewDetailInfoVO> interviewPlanList = hyPartnerInterviewPlanService.getInterviewPlanList(userId,dateTime);
interviewScheduleInfoVO.setInterviewDetailInfoVOS(interviewPlanList); interviewScheduleInfoVO.setInterviewDetailInfoVOS(interviewPlanList);
return interviewScheduleInfoVO; return interviewScheduleInfoVO;

7
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java
View File

@@ -67,9 +67,10 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan
@Override @Override
public List<InterviewDetailInfoVO> getInterviewPlanList(String userId) { public List<InterviewDetailInfoVO> getInterviewPlanList(String userId,Date dateTime) {
String currentTime = DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_DAY); String currentDay = DateUtil.format(dateTime, CoolDateUtils.DATE_FORMAT_DAY);
List<HyPartnerInterviewPlanDO> interviewPlanList = hyPartnerInterviewPlanDAO.getInterviewPlanList(userId, currentTime); String currentTime = DateUtil.format(dateTime, CoolDateUtils.DATE_FORMAT_SEC);
List<HyPartnerInterviewPlanDO> interviewPlanList = hyPartnerInterviewPlanDAO.getInterviewPlanList(userId, currentTime,currentDay);
if (CollectionUtils.isEmpty(interviewPlanList)){ if (CollectionUtils.isEmpty(interviewPlanList)){
return Lists.newArrayList(); return Lists.newArrayList();
} }