|  | @@ -922,6 +922,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 | 
	
		
			
				|  |  |              Map<Integer, Map<String, Integer>> holiday = jiaRiFeignService.query(now.getYear());
 | 
	
		
			
				|  |  |              holidayDays = holiday.get(now.getYear());
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | +        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          WhileNode:
 | 
	
		
			
				|  |  |          while (true) {
 | 
	
	
		
			
				|  | @@ -934,8 +935,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 | 
	
		
			
				|  |  |                  if (!courseTimeDto.getDayOfWeek().equals(dayOfWeek)) continue;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |                  //课时长度
 | 
	
		
			
				|  |  | -                long classCourseDuration = Duration.between(LocalDateTime.parse(classGroup4MixDto.getStartDate() + " " + courseTimeDto.getStartClassTime() + ":00"),
 | 
	
		
			
				|  |  | -                        LocalDateTime.parse(classGroup4MixDto.getStartDate() + " " + courseTimeDto.getEndClassTime() + ":00"))
 | 
	
		
			
				|  |  | +                long classCourseDuration = Duration.between(LocalDateTime.parse(classGroup4MixDto.getStartDate() + " " + courseTimeDto.getStartClassTime() + ":00",formatter),
 | 
	
		
			
				|  |  | +                        LocalDateTime.parse(classGroup4MixDto.getStartDate() + " " + courseTimeDto.getEndClassTime() + ":00",formatter))
 | 
	
		
			
				|  |  |                          .toMinutes();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -1130,6 +1131,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 | 
	
		
			
				|  |  |              Map<Integer, Map<String, Integer>> holiday = jiaRiFeignService.query(now.getYear());
 | 
	
		
			
				|  |  |              holidayDays = holiday.get(now.getYear());
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | +        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          WhileNode:
 | 
	
		
			
				|  |  |          while (true) {
 | 
	
	
		
			
				|  | @@ -1142,8 +1144,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 | 
	
		
			
				|  |  |                  if (!courseTimeDto.getDayOfWeek().equals(dayOfWeek)) continue;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |                  //课时长度
 | 
	
		
			
				|  |  | -                long classCourseDuration = Duration.between(LocalDateTime.parse(classGroup4MixDto.getStartDate() + " " + courseTimeDto.getStartClassTime() + ":00"),
 | 
	
		
			
				|  |  | -                        LocalDateTime.parse(classGroup4MixDto.getStartDate() + " " + courseTimeDto.getEndClassTime() + ":00"))
 | 
	
		
			
				|  |  | +                long classCourseDuration = Duration.between(LocalDateTime.parse(classGroup4MixDto.getStartDate() + " " + courseTimeDto.getStartClassTime() + ":00",formatter),
 | 
	
		
			
				|  |  | +                        LocalDateTime.parse(classGroup4MixDto.getStartDate() + " " + courseTimeDto.getEndClassTime() + ":00",formatter))
 | 
	
		
			
				|  |  |                          .toMinutes();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -1335,6 +1337,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 | 
	
		
			
				|  |  |              Map<Integer, Map<String, Integer>> holiday = jiaRiFeignService.query(now.getYear());
 | 
	
		
			
				|  |  |              holidayDays = holiday.get(now.getYear());
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | +        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          WhileNode:
 | 
	
		
			
				|  |  |          while (true) {
 | 
	
	
		
			
				|  | @@ -1348,8 +1351,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 | 
	
		
			
				|  |  |                  if (!courseTimeDto.getDayOfWeek().equals(dayOfWeek)) continue;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |                  //课时长度
 | 
	
		
			
				|  |  | -                long classCourseDuration = Duration.between(LocalDateTime.parse(classGroup4MixDto.getStartDate() + " " + courseTimeDto.getStartClassTime() + ":00"),
 | 
	
		
			
				|  |  | -                        LocalDateTime.parse(classGroup4MixDto.getStartDate() + " " + courseTimeDto.getEndClassTime() + ":00"))
 | 
	
		
			
				|  |  | +                long classCourseDuration = Duration.between(LocalDateTime.parse(classGroup4MixDto.getStartDate() + " " + courseTimeDto.getStartClassTime() + ":00",formatter),
 | 
	
		
			
				|  |  | +                        LocalDateTime.parse(classGroup4MixDto.getStartDate() + " " + courseTimeDto.getEndClassTime() + ":00",formatter))
 | 
	
		
			
				|  |  |                          .toMinutes();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 |