|
@@ -2542,6 +2542,11 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
LocalDateTime applyEndDateTime = LocalDateTime.ofInstant(applyEndDate.toInstant(), DateUtil.zoneId);
|
|
|
int applyEndDateWeekNum = applyEndDateTime.get(weekFields.weekOfYear());
|
|
|
|
|
|
+ if(!CollectionUtils.isEmpty(disableApplyWeekNum)&&!disableApplyWeekNum.contains(applyStartDateWeekNum)&&!disableApplyWeekNum.contains(applyEndDateWeekNum)){
|
|
|
+ result.put("teacherFreeDays", new HashMap<>());
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
if(disableApplyWeekNum.contains(applyStartDateWeekNum)){
|
|
|
LocalDateTime applyStartSunDay = applyStartDateTime.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
|
|
|
while (applyStartDateTime.compareTo(applyStartSunDay)<=0){
|