课程转换

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseConvertLogDao.java

@@ -9,7 +9,6 @@ import java.util.Map;
 
 public interface CourseConvertLogDao extends BaseDAO<Integer, CourseConvertLog> {
 
-
     void updateRevoke(Integer courseConvertId);
 
     int countConvertPage(Map<String, Object> params);

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

@@ -76,6 +76,7 @@ public class CourseConvertLogServiceImpl extends BaseServiceImpl<Integer, Course
 		List<CourseSchedule> courseSchedules = courseScheduleDao.findByCourseScheduleIds(oldCourseIdList);
 		Integer oldClassId = courseSchedules.stream().map(e -> e.getClassGroupId()).findFirst().get();
 		ClassGroup classGroup = classGroupDao.get(oldClassId);
+		courseConvertLog.setMusicGroupId(classGroup.getMusicGroupId());
 		courseConvertLog.setOldClassId(oldClassId);
 		courseConvertLog.setOldClassName(classGroup.getName());
 		courseConvertLog.setOldCourseJson(JSONObject.toJSONString(courseSchedules));

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

@@ -46,7 +46,9 @@
 	</resultMap>
 	<!-- 分页查询 -->
 	<select id="queryConvertPage" resultMap="CourseConvertLogDto" parameterType="map">
-		SELECT ccl.* FROM course_convert_log ccl
+		SELECT ccl.id_,ccl.old_course_ids_,ccl.old_class_id_,ccl.new_course_ids_,ccl.new_class_ids_,ccl.operator_,
+		ccl.revoke_flag_,ccl.create_time_,ccl.update_time_,ccl.music_group_id_,ccl.old_class_name_,ccl.operator_name_
+		FROM course_convert_log ccl
 		<include refid="queryPageSql"/>
 		<include refid="global.limit"/>
 	</select>