update

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VideoLessonGroupDao.java

@@ -59,8 +59,6 @@ public interface VideoLessonGroupDao extends BaseMapper<VideoLessonGroup> {
 
     VideoLessonAuthGroup authGroupDetil(@Param("videoGroupId") Long videoGroupId);
 
-    VideoLessonGroupLog lastAuthGroupDetil(@Param("videoGroupId")Long videoGroupId);
-
     //根据组id查详情
     VideoLessonGroup selectGroupById(Long groupId);
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonGroupMapper.xml

@@ -385,7 +385,27 @@
 
 	<select id="queryGroupHistoryList" resultType="com.yonge.cooleshow.biz.dal.vo.VideoLessonAuthGroup">
 		SELECT
-			<include refid="recordColumns"/>
+			g.id_ AS id,
+			g.lesson_name_ AS lessonName,
+			g.lesson_subject_ AS lessonSubject,
+			g.lesson_desc_ AS lessonDesc,
+			g.lesson_price_ AS lessonPrice,
+			g.lesson_cover_url_ AS lessonCoverUrl,
+			g.teacher_id_ AS teacherId,
+			g.lesson_count_ AS lessonCount,
+			g.sort_number_ AS sortNumber,
+			g.lesson_tag_ AS lessonTag,
+			g.top_flag_ AS topFlag,
+			g.hot_flag_ AS hotFlag,
+			g.shelves_flag_ AS shelvesFlag,
+			g.shelves_time_ as shelvesTime,
+			g.shelves_reason_ as shelvesReason,
+			g.create_time_ AS createTime,
+			g.update_time_ AS updateTime,
+			r.audit_id_ AS auditId,
+			r.audit_name_ AS auditName,
+			r.audit_status_ AS auditStatus,
+			g.audit_version_ as auditVersion,
 			r.video_group_id_ as videoGroupId,
 			r.group_id_ as groupId,
 			r.audit_status_ AS auditStatus,
@@ -437,10 +457,30 @@
 
 	<select id="authGroupDetil" resultType="com.yonge.cooleshow.biz.dal.vo.VideoLessonAuthGroup">
 		SELECT
-			<include refid="recordColumns"/>
+			g.id_ AS id,
+			g.lesson_name_ AS lessonName,
+			g.lesson_subject_ AS lessonSubject,
+			g.lesson_desc_ AS lessonDesc,
+			g.lesson_price_ AS lessonPrice,
+			g.lesson_cover_url_ AS lessonCoverUrl,
+			g.teacher_id_ AS teacherId,
+			g.lesson_count_ AS lessonCount,
+			g.sort_number_ AS sortNumber,
+			g.lesson_tag_ AS lessonTag,
+			g.top_flag_ AS topFlag,
+			g.hot_flag_ AS hotFlag,
+			g.shelves_flag_ AS shelvesFlag,
+			g.shelves_time_ as shelvesTime,
+			g.shelves_reason_ as shelvesReason,
+			g.create_time_ AS createTime,
+			g.update_time_ AS updateTime,
+			g.audit_version_ as auditVersion,
+			r.audit_id_ AS auditId,
+			r.audit_name_ AS auditName,
+			r.audit_status_ AS auditStatus,
+			r.version_ as version,
 			r.video_group_id_ as videoGroupId,
 			r.group_id_ as groupId,
-			r.audit_status_ AS auditStatus,
 			r.remarks as remarks,
 			s.name_ AS subjectName,
 			t.username_ AS teacherName,
@@ -451,29 +491,9 @@
 		LEFT JOIN `subject` s ON g.lesson_subject_=s.id_
 		LEFT JOIN sys_user t ON g.teacher_id_=t.id_
 		where r.video_group_id_ = #{videoGroupId}
+		order by r.id_ desc limit 1
 	</select>
 
-	<select id="lastAuthGroupDetil" resultType="com.yonge.cooleshow.biz.dal.vo.VideoLessonAuthGroup">
-		SELECT
-			<include refid="recordColumns"/>
-			r.video_group_id_ as videoGroupId,
-			r.group_id_ as groupId,
-			r.audit_status_ AS auditStatus,
-			r.remarks as remarks,
-			r.version_ as version,
-			s.name_ AS subjectName,
-			t.username_ AS teacherName,
-			t.real_name_ AS realName,
-			t.phone_ AS teacherPhone
-		FROM video_lesson_auth_record r
-		LEFT JOIN video_lesson_group_log g ON g.video_group_id_=r.video_group_id_ and g.version_ = r.version_
-		LEFT JOIN `subject` s ON g.lesson_subject_=s.id_
-		LEFT JOIN sys_user t ON g.teacher_id_=t.id_
-		where gl.video_group_id_ != #{videoGroupId}
-		order by gl.id_ desc limit 1
-	</select>
-
-
 	<select id="selectGroupById" resultType="com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup"
             parameterType="java.lang.Long">
 		SELECT