|
@@ -780,7 +780,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (!CollectionUtils.isEmpty(firstWeekCourses)) {
|
|
|
+ if (!CollectionUtils.isEmpty(secondWeekCourses)) {
|
|
|
Map<GroupType, Long> groupTypeCountSecondMap = secondWeekCourses.stream().collect(Collectors.groupingBy(CourseSchedule::getGroupType, Collectors.counting()));
|
|
|
if (Objects.nonNull(groupTypeCountSecondMap.get(GroupType.PRACTICE)) && groupTypeCountSecondMap.get(GroupType.PRACTICE) >= 80) {
|
|
|
secondWeekEnableApply = false;
|
|
@@ -807,7 +807,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
&&enableApplyDate.before(leaveEndTime)) {
|
|
|
continue;
|
|
|
}
|
|
|
- if (!enableApplyDate.before(enableApplyStartDate)) {
|
|
|
+ if (!enableApplyDate.before(enableApplyStartDate)&&!enableApplyEndDate.before(enableApplyDate)) {
|
|
|
tempEnableApplyDates.add(enableApplyDate);
|
|
|
}
|
|
|
}
|