Merge branch 'online-2020-11-23' of http://git.dayaedu.com/yonge/mec

 Conflicts:

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

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

@@ -1,11 +1,8 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.CourseGenerateDto;
-import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
-import com.ym.mec.biz.dal.entity.CourseScheduleAuditDetailDto;
-import com.ym.mec.biz.dal.entity.CourseScheduleComplaints;
 import com.ym.mec.biz.dal.enums.AuditStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.TeachModeEnum;
@@ -609,7 +606,7 @@ 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

@@ -5118,48 +5118,49 @@ 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);
-		List<CourseScheduleModifyLog> scheduleModifyLogs = courseScheduleModifyLogDao.findAll(param);
-		if(scheduleModifyLogs == null || scheduleModifyLogs.size() == 0){
-			return null;
-		}
-		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);
-			}
-		}
-		if(courseSchedules.size() > 0){
-			Set<Integer> actualTeacherIds = courseSchedules.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toSet());
-			actualTeacherIds.addAll(courseSchedules.stream().map(e -> e.getTeacherId()).collect(Collectors.toSet()));
-			actualTeacherIds.addAll(courseSchedules.stream().map(e -> e.getOperatorId()).collect(Collectors.toSet()));
-			Set<Integer> schoolIds = courseSchedules.stream().map(e -> e.getSchoolId()).collect(Collectors.toSet());
-			Map<Integer, String> actualTeacherMap = getMap("sys_user", "id_", "real_name_", actualTeacherIds, Integer.class, String.class);
-			Map<Integer, String> schoolMap = new HashMap<>();
-			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()));
-			}
-			return courseSchedules;
-		}
-		return null;
+		return courseScheduleModifyLogDao.findAll(param);
+//		if(scheduleModifyLogs == null || scheduleModifyLogs.size() == 0){
+//			return null;
+//		}
+//		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);
+//			}
+//		}
+//		if(courseSchedules.size() > 0){
+//			Set<Integer> actualTeacherIds = courseSchedules.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toSet());
+//			actualTeacherIds.addAll(courseSchedules.stream().map(e -> e.getTeacherId()).collect(Collectors.toSet()));
+//			actualTeacherIds.addAll(courseSchedules.stream().map(e -> e.getOperatorId()).collect(Collectors.toSet()));
+//			Set<Integer> schoolIds = courseSchedules.stream().map(e -> e.getSchoolId()).collect(Collectors.toSet());
+//			Map<Integer, String> actualTeacherMap = getMap("sys_user", "id_", "real_name_", actualTeacherIds, Integer.class, String.class);
+//			Map<Integer, String> schoolMap = new HashMap<>();
+//			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()));
+//			}
+//			return courseSchedules;
+//		}
+//		return null;
 	}
 
 	@Override