|
@@ -15,11 +15,8 @@ import com.yonge.cooleshow.biz.dal.dto.search.VideoGroupSearch;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonGroupSearch;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonSearch;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.*;
|
|
|
-import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
|
|
|
-import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
|
|
|
-import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
|
|
|
+import com.yonge.cooleshow.biz.dal.enums.*;
|
|
|
import com.yonge.cooleshow.biz.dal.service.SysConfigService;
|
|
|
-import com.yonge.cooleshow.biz.dal.enums.TeacherTagEnum;
|
|
|
import com.yonge.cooleshow.biz.dal.service.SysMessageService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.TeacherService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
|
|
@@ -254,7 +251,9 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
|
|
|
//记录video_lesson_auth_record
|
|
|
VideoLessonAuthRecord record = new VideoLessonAuthRecord();
|
|
|
record.setVideoGroupId(lessonGroup.getId());
|
|
|
+ record.setGroupId(lessonGroup.getId());
|
|
|
record.setAuditStatus(AuthStatusEnum.DOING.getCode());
|
|
|
+ record.setAuthType(AuthTypeEnum.ADD);
|
|
|
recordDao.insert(record);
|
|
|
}
|
|
|
|
|
@@ -326,25 +325,44 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
|
|
|
public void update(VideoLessonVo lessonVo, SysUser sysUser) {
|
|
|
VideoLessonGroup lessonGroup = lessonVo.getLessonGroup();
|
|
|
List<VideoLessonGroupDetail> lessonList = lessonVo.getLessonList();
|
|
|
+ //判断是否有正在审核中
|
|
|
+ List<VideoLessonAuthRecord> videoLessonAuthRecords = recordDao.selectList(Wrappers.<VideoLessonAuthRecord>lambdaQuery()
|
|
|
+ .eq(VideoLessonAuthRecord::getGroupId, lessonGroup.getId())
|
|
|
+ .eq(VideoLessonAuthRecord::getAuditStatus, AuthStatusEnum.DOING.getCode()));
|
|
|
+ if(CollectionUtils.isNotEmpty(videoLessonAuthRecords)){
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- //查询原评审信息
|
|
|
- List<VideoLessonAuthRecord> recordList = recordDao.selectList(Wrappers.<VideoLessonAuthRecord>lambdaQuery().eq(VideoLessonAuthRecord::getVideoGroupId, lessonGroup.getId()));
|
|
|
- List<Long> recoreIds = recordList.stream().map(VideoLessonAuthRecord::getId).collect(Collectors.toList());
|
|
|
+ //校验声部
|
|
|
+ Long subjectId = Long.valueOf(lessonGroup.getLessonSubject());
|
|
|
+ List<Subject> subjectList = teacherDao.querySubject(sysUser.getId());
|
|
|
+ List<Long> longList = subjectList.stream().map(Subject::getId).collect(Collectors.toList());
|
|
|
+ if (!longList.contains(subjectId)) {
|
|
|
+ throw new BizException("该声部无法选择");
|
|
|
+ }
|
|
|
|
|
|
- //清除原有组&课
|
|
|
- videoLessonGroupDao.deleteById(lessonGroup.getId());
|
|
|
- videoLessonGroupDetailDao.deleteByGroupId(lessonGroup.getId());
|
|
|
+ //原视频组改为审核中,已下架
|
|
|
+ VideoLessonGroup oldGroup = videoLessonGroupDao.selectGroupById(lessonGroup.getId());
|
|
|
+ oldGroup.setAuditStatus(AuthStatusEnum.DOING);
|
|
|
+ oldGroup.setShelvesFlag(YesOrNoEnum.NO.getCode());
|
|
|
+ videoLessonGroupDao.updateById(oldGroup);
|
|
|
|
|
|
- //添加组
|
|
|
+ //创建新的评审记录
|
|
|
+ VideoLessonAuthRecord authRecord = new VideoLessonAuthRecord();
|
|
|
+ authRecord.setGroupId(lessonGroup.getId());
|
|
|
+
|
|
|
+ //创建新的课程组记录
|
|
|
lessonGroup.setTeacherId(sysUser.getId());
|
|
|
+ lessonGroup.setAuditVersion(YesOrNoEnum.NO);
|
|
|
+ lessonGroup.setId(null);
|
|
|
videoLessonGroupDao.insert(lessonGroup);
|
|
|
+ authRecord.setVideoGroupId(lessonGroup.getId());
|
|
|
|
|
|
for (VideoLessonGroupDetail detail : lessonList) {
|
|
|
+ detail.setId(null);
|
|
|
detail.setVideoLessonGroupId(lessonGroup.getId());
|
|
|
detail.setTeacherId(sysUser.getId());
|
|
|
}
|
|
|
-
|
|
|
- //添加课程
|
|
|
videoLessonGroupDetailDao.insertVideoLesson(lessonList);
|
|
|
|
|
|
//刷新统计
|
|
@@ -352,14 +370,11 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
|
|
|
groupUpVo.setId(lessonGroup.getId());
|
|
|
videoLessonGroupDao.updateGroup(groupUpVo);
|
|
|
|
|
|
- //更新历史记录的组id
|
|
|
- recordDao.updateIds(recoreIds, lessonGroup.getId());
|
|
|
+ //提交审核
|
|
|
+ authRecord.setAuditStatus(AuthStatusEnum.DOING.getCode());
|
|
|
+ authRecord.setAuthType(AuthTypeEnum.MODIFY);
|
|
|
|
|
|
- //重新提审
|
|
|
- VideoLessonAuthRecord record = new VideoLessonAuthRecord();
|
|
|
- record.setVideoGroupId(lessonGroup.getId());
|
|
|
- record.setAuditStatus(AuthStatusEnum.DOING.getCode());
|
|
|
- recordDao.insert(record);
|
|
|
+ recordDao.insert(authRecord);
|
|
|
}
|
|
|
|
|
|
/**
|