|
|
@@ -12,6 +12,7 @@ import com.ym.mec.biz.dal.dao.TeacherDao;
|
|
|
import com.ym.mec.biz.dal.dto.SimpleUserDto;
|
|
|
import com.ym.mec.biz.dal.entity.LessonCourseware;
|
|
|
import com.ym.mec.biz.dal.entity.LessonCoursewareUserMapper;
|
|
|
+import com.ym.mec.biz.dal.entity.SysMusicScore;
|
|
|
import com.ym.mec.biz.dal.mapper.LessonCoursewareMapper;
|
|
|
import com.ym.mec.biz.dal.wrapper.LessonCoursewareWrapper;
|
|
|
import com.ym.mec.biz.service.LessonCoursewareService;
|
|
|
@@ -220,10 +221,14 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
|
|
|
List<CbsMaterialRefWrapper.AddMaterialRef> materialRefs = materialSmall.getMaterialRefs();
|
|
|
if (CollectionUtils.isNotEmpty(materialRefs)){
|
|
|
for (CbsMaterialRefWrapper.AddMaterialRef materialRef : materialRefs) {
|
|
|
+ materialRef.setResourceId(null);
|
|
|
CbsMaterialRefWrapper.RelateMaterialInfo relateMaterialInfo = materialRef.getRelateMaterialInfo();
|
|
|
if(relateMaterialInfo != null && StringUtils.equals(relateMaterialInfo.getType(),"SONG")
|
|
|
&& CollectionUtils.isNotEmpty(relateMaterialInfo.getApplicationIdList())){
|
|
|
- materialRef.setResourceIdStr(relateMaterialInfo.getId().toString());
|
|
|
+ SysMusicScore musicScore = sysMusicScoreService.getDao().getCbsId(relateMaterialInfo.getId());
|
|
|
+ if(musicScore != null) {
|
|
|
+ materialRef.setResourceId(musicScore.getId().longValue());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
