|
|
@@ -195,6 +195,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
calendar.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
calendar.set(Calendar.MINUTE, 0);
|
|
|
calendar.set(Calendar.SECOND, 0);
|
|
|
+ calendar.set(Calendar.MILLISECOND, 0);
|
|
|
List<Integer> firstTeacherIds = new ArrayList<>();
|
|
|
List<Integer> secondTeacherIds = new ArrayList<>();
|
|
|
while (calendar.getTime().before(activityEndDate)) {
|
|
|
@@ -385,6 +386,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
calendar.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
calendar.set(Calendar.MINUTE, 0);
|
|
|
calendar.set(Calendar.SECOND, 0);
|
|
|
+ calendar.set(Calendar.MILLISECOND, 0);
|
|
|
List<Integer> firstTeacherIds = new ArrayList<>();
|
|
|
List<Integer> secondTeacherIds = new ArrayList<>();
|
|
|
while (calendar.getTime().before(activityEndDate)) {
|
|
|
@@ -609,6 +611,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
calendar.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
calendar.set(Calendar.MINUTE, 0);
|
|
|
calendar.set(Calendar.SECOND, 0);
|
|
|
+ calendar.set(Calendar.MILLISECOND, 0);
|
|
|
while (calendar.getTime().before(activityEndDate)) {
|
|
|
calendar.add(Calendar.DATE, 1);
|
|
|
Date applyStartDay = calendar.getTime();
|
|
|
@@ -653,7 +656,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
} else {
|
|
|
secondWeekCourses.add(teacherCours);
|
|
|
}
|
|
|
- if (!teacherCours.getClassDate().before(applyStartDay)
|
|
|
+ if ((!teacherCours.getClassDate().before(applyStartDay))
|
|
|
&& (teacherCours.getClassDate().before(applyEndDay) || DateUtil.isSameDay(teacherCours.getClassDate(), applyEndDay))) {
|
|
|
applyDateRangeCourses.add(teacherCours);
|
|
|
}
|
|
|
@@ -751,6 +754,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
result.put("teacherFreeDays", days);
|
|
|
allTeacherFreeDates = allTeacherFreeDates.stream().sorted().collect(Collectors.toSet());
|
|
|
result.put("teacherFreeDates", allTeacherFreeDates);
|
|
|
+ }else{
|
|
|
+ result.put("teacherFreeDays", new ArrayList<>());
|
|
|
}
|
|
|
return result;
|
|
|
}
|
|
|
@@ -762,6 +767,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
calendar.setTime(startDay);
|
|
|
calendar.add(Calendar.DATE, -1);
|
|
|
calendar.set(Calendar.SECOND, 0);
|
|
|
+ calendar.set(Calendar.MILLISECOND, 0);
|
|
|
SysConfig practiceApplyStartTimeConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_APPLY_START_TIME);
|
|
|
SysConfig practiceApplyEndTimeConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_APPLY_END_TIME);
|
|
|
SysConfig practiceApplyIntervalTimeConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_APPLY_INTERVAL_TIME);
|
Joburgess