Merge branch 'dev_1_3_3_20220822'

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

@@ -161,6 +161,10 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void updateGroup(VideoLessonExamineVo examineVo) {
+    	
+    	if (examineVo.getAuditStatus().equals("PASS")) {
+    		examineVo.setShelvesFlag(1);
+    	}
         //改主表
         videoLessonGroupDao.updateExamine(examineVo);
 
@@ -511,13 +515,14 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
     public VideoLessonAuthGroup authGroupDetil(Long videoGroupId) {
         VideoLessonAuthGroup videoLessonAuthGroup = baseMapper.authGroupDetil(videoGroupId);
 
-        List<VideoLessonGroupDetail> details = videoLessonGroupDetailDao.queryByVideoLessonGroupId(videoGroupId);
-        videoLessonAuthGroup.setVideoList(details);
-
         //查询上一次的提交
         VideoLessonGroupLog lastDetil = videoLessonGroupLogService.queryByVideoLessonGroupId(videoGroupId, videoLessonAuthGroup.getVersion());
         videoLessonAuthGroup.setLastVideoLessonGroupLog(lastDetil);
         
+        if(lastDetil != null){
+        	videoLessonAuthGroup.setVideoList(JsonUtil.parseArray(lastDetil.getVideoDetailJson(), VideoLessonGroupDetail.class));
+        }
+        
         return videoLessonAuthGroup;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/VideoLessonExamineVo.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
 import com.yonge.cooleshow.common.entity.BaseEntity;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -33,6 +34,8 @@ public class VideoLessonExamineVo extends BaseEntity {
     private Long auditId;
 
     private String auditName;
+    
+    private Integer shelvesFlag;
 
     public Long getAuditId() {
         return auditId;
@@ -65,4 +68,12 @@ public class VideoLessonExamineVo extends BaseEntity {
     public void setAuditStatus(String auditStatus) {
         this.auditStatus = auditStatus;
     }
+
+	public Integer getShelvesFlag() {
+		return shelvesFlag;
+	}
+
+	public void setShelvesFlag(Integer shelvesFlag) {
+		this.shelvesFlag = shelvesFlag;
+	}
 }

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

@@ -95,6 +95,7 @@
 	<update id="updateExamine" parameterType="com.yonge.cooleshow.biz.dal.vo.VideoLessonExamineVo">
 		UPDATE video_lesson_group
 		<set>
+			<if test="shelvesFlag !=null">shelves_flag_ = #{shelvesFlag},</if>
 			<if test="auditStatus !=null and auditStatus !=''">audit_status_ = #{auditStatus},</if>
 			<if test="auditName !=null and auditName!=''">audit_name_ = #{auditName},</if>
 			<if test="auditId !=null">audit_id_ = #{auditId},</if>