|
|
@@ -450,9 +450,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
System.out.println(DateUtil.dateToString(new Date(), "HH:mm:ss"));
|
|
|
if(allCourseSchedules.size()>1){
|
|
|
//记录连续冲突的次数
|
|
|
- Integer repeatTimes=1;
|
|
|
+ int repeatTimes=1;
|
|
|
for (int i=1;i<allCourseSchedules.size();i++){
|
|
|
- for(int j=repeatTimes;j>0;j--){
|
|
|
+ int temp_repeat=repeatTimes;
|
|
|
+ for(int j=1;j<=temp_repeat;j++){
|
|
|
//当前课程
|
|
|
CourseSchedule preCourseSchedule = allCourseSchedules.get(i-j);
|
|
|
//后面一节课程
|
zouxuan