|
@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
@@ -291,7 +292,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
|
|
|
VideoLessonGroupLog videoLessonGroupLog = new VideoLessonGroupLog();
|
|
|
|
|
|
try {
|
|
|
- BeanUtils.copyProperties(videoLessonGroupLog, lessonGroup);
|
|
|
+ org.springframework.beans.BeanUtils.copyProperties(lessonGroup, videoLessonGroupLog);
|
|
|
} catch (Exception e) {
|
|
|
throw new BizException("属性复制失败");
|
|
|
}
|
|
@@ -375,9 +376,10 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
|
|
|
VideoLessonGroup lessonGroup = lessonVo.getLessonGroup();
|
|
|
List<VideoLessonGroupDetail> lessonList = lessonVo.getLessonList();
|
|
|
//判断是否有正在审核中
|
|
|
- List<VideoLessonAuthRecord> videoLessonAuthRecords = recordDao.selectList(Wrappers.<VideoLessonAuthRecord>lambdaQuery()
|
|
|
- .eq(VideoLessonAuthRecord::getVideoGroupId, lessonGroup.getId())
|
|
|
- .eq(VideoLessonAuthRecord::getAuditStatus, AuthStatusEnum.DOING.getCode()));
|
|
|
+ QueryWrapper<VideoLessonAuthRecord> wrapper = new QueryWrapper<VideoLessonAuthRecord>();
|
|
|
+ wrapper.eq("video_group_id_", lessonGroup.getId()).eq("audit_status_", AuthStatusEnum.DOING.getCode());
|
|
|
+
|
|
|
+ List<VideoLessonAuthRecord> videoLessonAuthRecords = recordDao.selectList(wrapper);
|
|
|
if(CollectionUtils.isNotEmpty(videoLessonAuthRecords)){
|
|
|
throw new BizException("正在审核中,无法修改");
|
|
|
}
|
|
@@ -404,10 +406,11 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
|
|
|
VideoLessonGroupLog videoLessonGroupLog = new VideoLessonGroupLog();
|
|
|
|
|
|
try {
|
|
|
- BeanUtils.copyProperties(videoLessonGroupLog, lessonGroup);
|
|
|
+ org.springframework.beans.BeanUtils.copyProperties(lessonGroup, videoLessonGroupLog);
|
|
|
} catch (Exception e) {
|
|
|
throw new BizException("属性复制失败");
|
|
|
}
|
|
|
+
|
|
|
videoLessonGroupLog.setId(null);
|
|
|
videoLessonGroupLog.setVideoLessonGroupId(lessonGroup.getId());
|
|
|
videoLessonGroupLog.setCreateTime(date);
|
|
@@ -422,6 +425,15 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
|
|
|
lessonGroup.setAuditStatus(AuthStatusEnum.DOING);
|
|
|
lessonGroup.setUpdateTime(date);
|
|
|
videoLessonGroupDao.updateById(lessonGroup);
|
|
|
+
|
|
|
+ if (lessonList != null && lessonList.size() > 0) {
|
|
|
+ for (VideoLessonGroupDetail detail : lessonList) {
|
|
|
+ detail.setVideoLessonGroupId(lessonGroup.getId());
|
|
|
+ detail.setTeacherId(sysUser.getId());
|
|
|
+ }
|
|
|
+ // 添加课程
|
|
|
+ videoLessonGroupDetailDao.insertVideoLesson(lessonList);
|
|
|
+ }
|
|
|
|
|
|
//刷新统计
|
|
|
VideoLessonGroupUpVo groupUpVo = new VideoLessonGroupUpVo();
|