zouxuan 4 年之前
父节点
当前提交
6fdf21246d
共有 1 个文件被更改,包括 6 次插入1 次删除
  1. 6 1
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

+ 6 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -5130,7 +5130,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		List<CourseScheduleAuditDetailDto> courseSchedules = new ArrayList<>();
 		for (int i = scheduleModifyLogs.size() - 1; i >= 0; i--) {
 			CourseScheduleModifyLog modifyLog = scheduleModifyLogs.get(i);
-			courseSchedules.add(JSON.parseObject(modifyLog.getCurrentCourseSchedule(), CourseScheduleAuditDetailDto.class));
+			CourseScheduleAuditDetailDto auditDetailDto = JSON.parseObject(modifyLog.getPreviousCourseSchedule(), CourseScheduleAuditDetailDto.class);
+			auditDetailDto.setOperatorId(modifyLog.getOperatorId());
+			courseSchedules.add(auditDetailDto);
+			CourseScheduleAuditDetailDto auditDetailDto1 = JSON.parseObject(modifyLog.getCurrentCourseSchedule(), CourseScheduleAuditDetailDto.class);
+			auditDetailDto1.setOperatorId(modifyLog.getOperatorId());
+			courseSchedules.add(auditDetailDto1);
 		}
 		if(courseSchedules.size() > 0){
 			Set<Integer> actualTeacherIds = courseSchedules.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toSet());