zouxuan 4 jaren geleden
bovenliggende
commit
4be23cb756
1 gewijzigde bestanden met toevoegingen van 5 en 8 verwijderingen
  1. 5 8
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

+ 5 - 8
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -5121,8 +5121,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			return null;
 		}
 		List<CourseScheduleAuditDetailDto> courseSchedules = new ArrayList<>();
-		for (int i = 0; i < scheduleModifyLogs.size(); i++) {
+		for (int i = scheduleModifyLogs.size() - 1; i >= 0; i--) {
 			CourseScheduleModifyLog modifyLog = scheduleModifyLogs.get(i);
+			CourseScheduleAuditDetailDto detailDto = JSON.parseObject(modifyLog.getCurrentCourseSchedule(), CourseScheduleAuditDetailDto.class);
+			detailDto.setOperatorId(modifyLog.getOperatorId());
+			detailDto.setAuditTime(modifyLog.getCreateTime());
+			courseSchedules.add(detailDto);
 			if(i == 0){
 				//如果是第一次调整
 				CourseScheduleAuditDetailDto dto = JSON.parseObject(modifyLog.getPreviousCourseSchedule(), CourseScheduleAuditDetailDto.class);
@@ -5130,13 +5134,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				dto.setAuditTime(modifyLog.getCreateTime());
 				courseSchedules.add(dto);
 			}
-			if(i == 1){
-				continue;
-			}
-			CourseScheduleAuditDetailDto detailDto = JSON.parseObject(modifyLog.getCurrentCourseSchedule(), CourseScheduleAuditDetailDto.class);
-			detailDto.setOperatorId(modifyLog.getOperatorId());
-			detailDto.setAuditTime(modifyLog.getCreateTime());
-			courseSchedules.add(detailDto);
 		}
 		if(courseSchedules.size() > 0){
 			Set<Integer> actualTeacherIds = courseSchedules.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toSet());