Merge branch 'dev_1_3_3_20220822'

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

@@ -34,4 +34,6 @@ public interface VideoLessonGroupDetailDao extends BaseMapper<VideoLessonGroupDe
     void deleteByGroupId(Long groupId);
 
     List<VideoLessonGroupDetailVo> selectPageAuth(IPage page, @Param("param") VideoLessonSearch query);
+    
+    List<VideoLessonGroupDetail> queryByVideoLessonGroupId(Long videoLessonGroupId);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonAuthRecord.java

@@ -24,10 +24,6 @@ public class VideoLessonAuthRecord extends BaseEntity {
     @ApiModelProperty(value = "当前视频课组id")
     private Long videoGroupId;
 
-    @TableField("group_id_")
-    @ApiModelProperty(value = "视频课组id")
-    private Long groupId;
-
     @TableField("audit_status_")
     @ApiModelProperty(value = "审核状态(DOING:待审核,PASS:通过,UNPASS:拒绝)")
     private String auditStatus;
@@ -123,14 +119,6 @@ public class VideoLessonAuthRecord extends BaseEntity {
         this.updateTime = updateTime;
     }
 
-    public Long getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(Long groupId) {
-        this.groupId = groupId;
-    }
-
     public AuthTypeEnum getAuthType() {
         return authType;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonGroupServiceImpl.java

@@ -376,7 +376,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
         List<VideoLessonGroupDetail> lessonList = lessonVo.getLessonList();
         //判断是否有正在审核中
         List<VideoLessonAuthRecord> videoLessonAuthRecords = recordDao.selectList(Wrappers.<VideoLessonAuthRecord>lambdaQuery()
-                .eq(VideoLessonAuthRecord::getGroupId, lessonGroup.getId())
+                .eq(VideoLessonAuthRecord::getVideoGroupId, lessonGroup.getId())
                 .eq(VideoLessonAuthRecord::getAuditStatus, AuthStatusEnum.DOING.getCode()));
         if(CollectionUtils.isNotEmpty(videoLessonAuthRecords)){
         	throw new BizException("正在审核中，无法修改");
@@ -468,8 +468,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
     public VideoLessonAuthGroup authGroupDetil(Long videoGroupId) {
         VideoLessonAuthGroup videoLessonAuthGroup = baseMapper.authGroupDetil(videoGroupId);
 
-        List<VideoLessonGroupDetail> details = videoLessonGroupDetailDao.selectList(Wrappers.<VideoLessonGroupDetail>lambdaQuery()
-                .eq(VideoLessonGroupDetail::getVideoLessonGroupId, videoGroupId));
+        List<VideoLessonGroupDetail> details = videoLessonGroupDetailDao.queryByVideoLessonGroupId(videoGroupId);
         videoLessonAuthGroup.setVideoList(details);
 
         //查询上一次的提交

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

@@ -126,5 +126,9 @@
 		FROM video_lesson_group_detail
 		WHERE video_lesson_group_id_ = #{groupId}
 	</delete>
+	
+	<select id="queryByVideoLessonGroupId" resultMap="BaseResultMap">
+		select * from video_lesson_group_detail WHERE video_lesson_group_id_ = #{videoLessonGroupId}
+	</select>
 
 </mapper>

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

@@ -127,7 +127,6 @@
 		LEFT JOIN sys_user s ON g.teacher_id_ = s.id_
 		LEFT JOIN `subject` b ON g.lesson_subject_=b.id_
 		<where>
-		    and g.history_flag_ = 0
 			<if test="param.shelvesFlag !=null">
 				AND g.shelves_flag_ = #{param.shelvesFlag}
 			</if>
@@ -171,7 +170,6 @@
 		LEFT JOIN sys_user s ON g.teacher_id_ = s.id_
 		LEFT JOIN subject j ON g.lesson_subject_ = j.id_
 		<where>
-			AND g.history_flag_ = 0
 			<if test="param.userId !=null">
 				AND p.student_id_ = #{param.userId}
 			</if>
@@ -218,7 +216,6 @@
 		FROM video_lesson_group g
 		LEFT JOIN subject j ON g.lesson_subject_ = j.id_
 		<where>
-			AND g.history_flag_ = 0
 			<if test="param.userId !=null">
 				AND g.teacher_id_ = #{param.userId}
 			</if>
@@ -292,7 +289,7 @@
 		LEFT JOIN sys_user u ON g.teacher_id_=u.id_
 		LEFT JOIN `subject` s ON g.lesson_subject_ = s.id_
 		<where>
-			AND g.history_flag_ = 0 and u.del_flag_ = 0
+			AND  u.del_flag_ = 0
 			<if test="null != param.search and '' != param.search">
 				AND (
 				u.username_ LIKE CONCAT('%', #{param.search}, '%') OR
@@ -407,7 +404,6 @@
 			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,
 			r.remarks as remarks,
 			r.version_ as version,
@@ -422,7 +418,7 @@
 		<where>
 			and r.audit_status_ != 'DOING'
 			<if test="null != param.groupId">
-				AND r.group_id_ = #{param.groupId}
+				AND r.video_group_id_ = #{param.groupId}
 			</if>
 			<if test="null != param.search and '' != param.search">
 				AND (
@@ -480,17 +476,16 @@
 			r.audit_status_ AS auditStatus,
 			r.version_ as version,
 			r.video_group_id_ as videoGroupId,
-			r.group_id_ as groupId,
 			r.remarks as remarks,
 			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 g ON g.id_=r.video_group_id_
+		FROM video_lesson_group g 
+		LEFT JOIN video_lesson_auth_record r ON g.id_=r.video_group_id_
 		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}
+		where g.id_ = #{videoGroupId}
 		order by r.id_ desc limit 1
 	</select>