|
@@ -1117,7 +1117,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
holiday = jiaRiFeignService.query(now.getYear());
|
|
|
holidayDays = holiday.get(now.getYear());
|
|
|
}
|
|
|
- if (classGroup4MixDto.getHoliday() && holidayDays.containsKey(now.format(DateTimeFormatter.ofPattern("MM-dd")))) {
|
|
|
+ if (classGroup4MixDto.getHoliday() && holidayDays.containsKey(now.format(DateTimeFormatter.ofPattern("MMdd")))) {
|
|
|
now = now.plusDays(1);
|
|
|
continue;
|
|
|
}
|
|
@@ -1332,7 +1332,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
holiday = jiaRiFeignService.query(now.getYear());
|
|
|
holidayDays = holiday.get(now.getYear());
|
|
|
}
|
|
|
- if (classGroup4MixDto.getHoliday() && holidayDays.containsKey(now.format(DateTimeFormatter.ofPattern("MM-dd")))) {
|
|
|
+ if (classGroup4MixDto.getHoliday() && holidayDays.containsKey(now.format(DateTimeFormatter.ofPattern("MMdd")))) {
|
|
|
now = now.plusDays(1);
|
|
|
continue;
|
|
|
}
|
|
@@ -1564,7 +1564,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
holiday = jiaRiFeignService.query(now.getYear());
|
|
|
holidayDays = holiday.get(now.getYear());
|
|
|
}
|
|
|
- if (classGroup4MixDto.getHoliday() && holidayDays.containsKey(now.format(DateTimeFormatter.ofPattern("MM-dd")))) {
|
|
|
+ if (classGroup4MixDto.getHoliday() && holidayDays.containsKey(now.format(DateTimeFormatter.ofPattern("MMdd")))) {
|
|
|
now = now.plusDays(1);
|
|
|
continue;
|
|
|
}
|