mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-13 21:06:48 +08:00
Merge branch 'zcwy0704-llf' into dev0525
This commit is contained in:
@@ -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()));
|
||||||
|
|||||||
Reference in New Issue
Block a user