update

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleService.java

@@ -606,6 +606,6 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 * @param courseScheduleId
 	 * @return
 	 */
-	List<CourseScheduleAuditDetailDto> queryCourseAdjustDetail(Long courseScheduleId);
+	List<CourseScheduleModifyLog> queryCourseAdjustDetail(Long courseScheduleId);
 
 }

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

@@ -5112,7 +5112,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	}
 
 	@Override
-	public List<CourseScheduleAuditDetailDto> queryCourseAdjustDetail(Long courseScheduleId) {
+	public List<CourseScheduleModifyLog> queryCourseAdjustDetail(Long courseScheduleId) {
 		//获取所有的更改记录
 		Map<String,Object> param = new HashMap(1);
 		param.put("courseScheduleId",courseScheduleId);
@@ -5120,17 +5120,7 @@ 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);
-			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);
-				dto.setOperatorId(modifyLog.getOperatorId());
-				dto.setAuditTime(modifyLog.getCreateTime());
-				courseSchedules.add(dto);
-			}
+			courseSchedules.add(JSON.parseObject(modifyLog.getCurrentCourseSchedule(), CourseScheduleAuditDetailDto.class));
 		}
 		if(courseSchedules.size() > 0){
 			Set<Integer> actualTeacherIds = courseSchedules.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toSet());
@@ -5142,14 +5132,22 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			if(schoolIds != null && schoolIds.size() > 0){
 				schoolMap = getMap("school", "id_", "name_", schoolIds, Integer.class, String.class);
 			}
-			for (CourseScheduleAuditDetailDto e : courseSchedules) {
-				e.setTeacherName(actualTeacherMap.get(e.getTeacherId()));
-				e.setActualTeacherName(actualTeacherMap.get(e.getActualTeacherId()));
-				e.setSchoolName(schoolMap.get(e.getSchoolId()));
-				e.setOperatorName(actualTeacherMap.get(e.getOperatorId()));
-				CourseScheduleModifyLog modifyLog = new CourseScheduleModifyLog();
+			for (CourseScheduleModifyLog modifyLog : scheduleModifyLogs) {
+				CourseScheduleAuditDetailDto preAuditDetailDto = JSON.parseObject(modifyLog.getPreviousCourseSchedule(), CourseScheduleAuditDetailDto.class);
+				preAuditDetailDto.setTeacherName(actualTeacherMap.get(preAuditDetailDto.getTeacherId()));
+				preAuditDetailDto.setActualTeacherName(actualTeacherMap.get(preAuditDetailDto.getActualTeacherId()));
+				preAuditDetailDto.setSchoolName(schoolMap.get(preAuditDetailDto.getSchoolId()));
+				preAuditDetailDto.setOperatorName(actualTeacherMap.get(preAuditDetailDto.getOperatorId()));
+				modifyLog.setPreviousCourseSchedule(JSONObject.toJSONString(preAuditDetailDto));
+
+				CourseScheduleAuditDetailDto auditDetailDto = JSON.parseObject(modifyLog.getCurrentCourseSchedule(), CourseScheduleAuditDetailDto.class);
+				auditDetailDto.setTeacherName(actualTeacherMap.get(auditDetailDto.getTeacherId()));
+				auditDetailDto.setActualTeacherName(actualTeacherMap.get(auditDetailDto.getActualTeacherId()));
+				auditDetailDto.setSchoolName(schoolMap.get(auditDetailDto.getSchoolId()));
+				auditDetailDto.setOperatorName(actualTeacherMap.get(auditDetailDto.getOperatorId()));
+				modifyLog.setCurrentCourseSchedule(JSONObject.toJSONString(auditDetailDto));
 			}
-			return courseSchedules;
+			return scheduleModifyLogs;
 		}
 		return null;
 	}