Merge branch 'zcwy0529-l' into 'master'

及格线

See merge request !102
This commit is contained in:
joshen
2024-05-28 20:11:35 +08:00

View File

@@ -67,13 +67,11 @@ public class StudyExamServiceImpl implements IStudyExamService{
//用于计算考试成绩
CourseExam cexam=cexamDao.get(exam.getTestId());
Integer passLine = 0;
if( exam.getPassLine() !=null){
passLine = exam.getPassLine();
if( exam.getPassLine() ==null){
exam.setPassLine(0);
}
int prog=exam.getScore().intValue()>= passLine?100:exam.getScore().intValue();
// int prog=exam.getScore().intValue()>=exam.getPassLine()?100:exam.getScore().intValue();
int prog=exam.getScore().intValue()>=exam.getPassLine()?100:exam.getScore().intValue();
//完成处理,判断是否已存在
Object obj=scItemDao.findField("id", FieldFilters.eq("studyId", exam.getStudyId()), FieldFilters.eq("contentId", exam.getContentId()));
int status=exam.getScore()>=exam.getPassLine()?StudyCourseItem.STATUS_FINISH:StudyCourseItem.STATUS_STUDYING;