视频课列表

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/VideoLessonController.java

@@ -274,8 +274,7 @@ public class VideoLessonController extends BaseController {
         if (lessonVo.getLessonGroup().getDraftFlag().equals(YesOrNoEnum.NO) && CollectionUtils.isEmpty(lessonVo.getLessonList())) {
             return failed("课程不能为空");
         }
-        lessonGroupService.update(lessonVo, sysUser);
-        return succeed();
+        return succeed(lessonGroupService.update(lessonVo, sysUser));
     }
 
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/CourseGroupSearch.java

@@ -26,7 +26,7 @@ public class CourseGroupSearch extends QueryInfo {
     @ApiModelProperty("课程id")
     private Long courseId;
 
-    @ApiModelProperty(value = "课程状态")
+    @ApiModelProperty(value = "课程状态 DOING UNPASS PASS")
     private String status;
 
     @ApiModelProperty(value = "结算状态")

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

@@ -48,7 +48,7 @@ public interface VideoLessonGroupService extends IService<VideoLessonGroup> {
 
     VideoLessonStudentVo selectVideoLesson(Long groupId);
 
-    void update(VideoLessonVo lessonVo, SysUser sysUser);
+    VideoLessonVo update(VideoLessonVo lessonVo, SysUser sysUser);
 
     IPage<LessonGroupVo> selectLessonGroup(IPage<LessonGroupVo> page, VideoLessonGroupSearch query);
 

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

@@ -546,10 +546,11 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
      * @Description: 修改视频课组&视频课
      * @Author: cy
      * @Date: 2022/4/7
+     * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(VideoLessonVo lessonVo, SysUser sysUser) {
+    public VideoLessonVo update(VideoLessonVo lessonVo, SysUser sysUser) {
         VideoLessonGroup lessonGroup = lessonVo.getLessonGroup();
         List<VideoLessonGroupDetailDto> lessonList = lessonVo.getLessonList();
         if (CollectionUtils.isEmpty(lessonList)) {
@@ -614,7 +615,9 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
         videoLessonGroupDao.updateById(lessonGroup);
 
         // 设置关联曲目
-        courseMusicAlbumRelation(lessonList,lessonGroup.getId(),lessonVo.getUserBy());
+        if (lessonVo.getPage() == 2) {
+            courseMusicAlbumRelation(lessonList, lessonGroup.getId(), lessonVo.getUserBy());
+        }
 
         if (lessonGroup.getDraftFlag().equals(YesOrNoEnum.NO)) {
 
@@ -640,6 +643,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
         VideoLessonGroupUpVo groupUpVo = new VideoLessonGroupUpVo();
         groupUpVo.setId(lessonGroup.getId());
         videoLessonGroupDao.updateGroup(groupUpVo);
+        return lessonVo;
     }
 
     /**

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

@@ -22,8 +22,19 @@ public class VideoLessonVo extends BaseEntity {
     @Valid
     private VideoLessonGroup lessonGroup;
 
+    @ApiModelProperty("后台保存草稿时，判断是第几页，第一页不处理关联曲目数据")
+    private Integer page = 2;
+
     private ValidList<@Valid VideoLessonGroupDetailDto> lessonList;
 
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
     public Long getUserBy() {
         return userBy;
     }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/VideoLessonGroupController.java

@@ -221,8 +221,7 @@ public class VideoLessonGroupController extends BaseController {
             return failed("课程不能为空");
         }
         lessonVo.getLessonGroup().setDraftFlag(YesOrNoEnum.NO);
-        videoLessonGroupService.update(lessonVo, sysUser);
-        return succeed();
+        return succeed(videoLessonGroupService.update(lessonVo, sysUser));
     }
 
 

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/VideoGroupController.java

@@ -152,7 +152,6 @@ public class VideoGroupController extends BaseController {
         if ( CollectionUtils.isEmpty(lessonVo.getLessonList())) {
             return failed("课程不能为空");
         }
-        videoLessonGroupService.update(lessonVo,sysUser);
-        return succeed();
+        return succeed(videoLessonGroupService.update(lessonVo,sysUser));
     }
 }