课程修改日志

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<CourseScheduleModifyLog> queryCourseAdjustDetail(Long courseScheduleId);
+	List<CourseScheduleAuditDetailDto> queryCourseAdjustDetail(Long courseScheduleId);
 
 }

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

@@ -5112,48 +5112,45 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	}
 
 	@Override
-	public List<CourseScheduleModifyLog> queryCourseAdjustDetail(Long courseScheduleId) {
-
+	public List<CourseScheduleAuditDetailDto> queryCourseAdjustDetail(Long courseScheduleId) {
 		//获取所有的更改记录
 		Map<String,Object> param = new HashMap(1);
 		param.put("courseScheduleId",courseScheduleId);
-		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;
+		List<CourseScheduleModifyLog> scheduleModifyLogs = courseScheduleModifyLogDao.findAll(param);
+		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()));
+				CourseScheduleModifyLog modifyLog = new CourseScheduleModifyLog();
+			}
+			return courseSchedules;
+		}
+		return null;
 	}
 }

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -137,7 +137,13 @@
         cs.name_,
         cs.student_num_,
         cs.leave_student_num_,
-        cs.schoole_id_
+        cs.schoole_id_,
+        cs.del_flag_,
+        cs.is_lock_,
+        cs.teaching_content_,
+        cs.note_,
+        cs.organ_id_,
+        cs.new_course_id_
     </sql>
 
     <!-- 根据主键查询一条记录 -->