|
@@ -1645,10 +1645,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
|
|
|
WhileNode:
|
|
|
while (true) {
|
|
|
- /*if(classGroup4MixDto.getHoliday() && !holiday.containsKey(now.getYear())){
|
|
|
+ if(classGroup4MixDto.getHoliday() && !holiday.containsKey(now.getYear())){
|
|
|
holiday = jiaRiFeignService.query(now.getYear());
|
|
|
holidayDays = holiday.get(now.getYear());
|
|
|
- }*/
|
|
|
+ }
|
|
|
if (classGroup4MixDto.getHoliday() && holidayDays.containsKey(now.format(DateTimeFormatter.ofPattern("MMdd")))) {
|
|
|
now = now.plusDays(1);
|
|
|
continue;
|