Merge branch 'zcwy0704-llf' into dev0525

This commit is contained in:
zhaolongfei
2024-07-08 15:52:14 +08:00

View File

@@ -57,10 +57,11 @@ public class CourseContentServiceImpl implements ICourseContentService {
//新增的情况 //新增的情况
cc.setDeleted(false); cc.setDeleted(false);
if (cc.getDuration()==null){ if (cc.getDuration()==null){
if (exam != null){ cc.setDuration(0);
cc.setDuration(exam.getTestDuration()*60); }
}else { if(exam!=null) {
cc.setDuration(0); if (exam.getTestDuration()!=null) {
cc.setDuration(exam.getTestDuration() * 60);
} }
} }
//如果是没有目录的,并具是课程内容 //如果是没有目录的,并具是课程内容
@@ -72,8 +73,10 @@ public class CourseContentServiceImpl implements ICourseContentService {
} }
ccDao.save(cc); ccDao.save(cc);
}else { }else {
if (cc.getDuration()!=null) { if(exam!=null) {
cc.setDuration(cc.getDuration()); if (exam.getTestDuration()!=null) {
cc.setDuration(exam.getTestDuration() * 60);
}
} }
ccDao.update(cc); ccDao.update(cc);
cc.setSysVersion(ccDao.getVersion(cc.getId())); cc.setSysVersion(ccDao.getVersion(cc.getId()));