|
|
@@ -43,7 +43,7 @@ public class RecruitInterviewServiceImpl extends ServiceImpl<RecruitInterviewMap
|
|
|
public List<RecruitInterviewVo> queryList(RecruitInterviewQueryBo bo) {
|
|
|
LambdaQueryWrapper<RecruitInterview> lqw = Wrappers.lambdaQuery();
|
|
|
lqw.eq(bo.getYear() != null, RecruitInterview::getYear, bo.getYear());
|
|
|
- lqw.eq(bo.getMoth() != null, RecruitInterview::getMoth, bo.getMoth());
|
|
|
+ lqw.eq(bo.getMonth() != null, RecruitInterview::getMonth, bo.getMonth());
|
|
|
lqw.eq(bo.getDay() != null, RecruitInterview::getDay, bo.getDay());
|
|
|
lqw.eq(StrUtil.isNotBlank(bo.getTimingStart()), RecruitInterview::getTimingStart, bo.getTimingStart());
|
|
|
lqw.eq(StrUtil.isNotBlank(bo.getTimingEnd()), RecruitInterview::getTimingEnd, bo.getTimingEnd());
|
|
|
@@ -114,18 +114,18 @@ public class RecruitInterviewServiceImpl extends ServiceImpl<RecruitInterviewMap
|
|
|
Calendar cal = Calendar.getInstance();
|
|
|
CalendarInterviewVo calendarInterviewVo = new CalendarInterviewVo();
|
|
|
//得到日历日期
|
|
|
- if (bo.getMoth() == null){
|
|
|
- bo.setMoth(cal.get(Calendar.MONTH)+1);
|
|
|
+ if (bo.getMonth() == null){
|
|
|
+ bo.setMonth(cal.get(Calendar.MONTH)+1);
|
|
|
}
|
|
|
- Long firstDayOfMonth = getFirstDayOfMonth(bo.getMoth());
|
|
|
- Long lastDayOfMonth = getLastDayOfMonth(bo.getMoth());
|
|
|
+ Long firstDayOfMonth = getFirstDayOfMonth(bo.getMonth());
|
|
|
+ Long lastDayOfMonth = getLastDayOfMonth(bo.getMonth());
|
|
|
List<DayInterviewVo> dayStudyVosOne = getDays(firstDayOfMonth,lastDayOfMonth);
|
|
|
for (DayInterviewVo dayInterviewVo : dayStudyVosOne) {
|
|
|
- List<RecruitInterviewVo> recruitInterviewVos=baseMapper.selectByDay(dayInterviewVo.getDate(),bo.getMoth(),bo.getYear());
|
|
|
+ List<RecruitInterviewVo> recruitInterviewVos=baseMapper.selectByDay(dayInterviewVo.getDate(),bo.getMonth(),bo.getYear());
|
|
|
dayInterviewVo.setRecruitInterviewList(recruitInterviewVos);
|
|
|
}
|
|
|
calendarInterviewVo.setYear(Convert.toLong(cal.get(Calendar.YEAR)));
|
|
|
- calendarInterviewVo.setMonth(Convert.toLong(bo.getMoth()));
|
|
|
+ calendarInterviewVo.setMonth(Convert.toLong(bo.getMonth()));
|
|
|
calendarInterviewVo.setDayInterviewVos(dayStudyVosOne);
|
|
|
return calendarInterviewVo;
|
|
|
}
|