diff --git a/src/main/java/com/zcloud/controller/study/ClassController.java b/src/main/java/com/zcloud/controller/study/ClassController.java index ca69231..803306f 100644 --- a/src/main/java/com/zcloud/controller/study/ClassController.java +++ b/src/main/java/com/zcloud/controller/study/ClassController.java @@ -452,20 +452,26 @@ public class ClassController extends BaseController { int ranDomPaperIndex = new Random().nextInt(paperList.size()); paperInfo = paperList.get(ranDomPaperIndex); } + //如果是线上考试并且自动考试,则走里面 + if ("1".equals(String.valueOf(pd.get("EXAMINATION"))) && "1".equals(String.valueOf(pd.get("AUTOEXAM")))) { + // 获取试卷题目 + List questionList = null; + if (paperInfo != null) { + List paperListForQuery = new ArrayList<>(); + paperListForQuery.add(paperInfo); + questionList = paperQuestionService.listAllByInputIds(paperListForQuery); + } - // 获取试卷题目 - List questionList = null; - if (paperInfo != null) { - List paperListForQuery = new ArrayList<>(); - paperListForQuery.add(paperInfo); - questionList = paperQuestionService.listAllByInputIds(paperListForQuery); - } - - for (PageData stu : stuList) { - saveStageStudent(stu, paperInfo, examination); - // 班级完成后,为每个学员生成考试记录(随机合格分数) - if (paperInfo != null && questionList != null && questionList.size() > 0) { - generateExamRecord(stu, paperInfo, questionList, pd); + for (PageData stu : stuList) { + saveStageStudent(stu, paperInfo, examination); + // 班级完成后,为每个学员生成考试记录(随机合格分数) + if (paperInfo != null && questionList != null && questionList.size() > 0) { + generateExamRecord(stu, paperInfo, questionList, pd); + } + } + } else { + for (PageData stu : stuList) { + saveStageStudent(stu, paperInfo, examination); } } diff --git a/src/main/resources/mybatis/datasource/study/ClassMapper.xml b/src/main/resources/mybatis/datasource/study/ClassMapper.xml index 7bd330b..e6ca127 100644 --- a/src/main/resources/mybatis/datasource/study/ClassMapper.xml +++ b/src/main/resources/mybatis/datasource/study/ClassMapper.xml @@ -59,7 +59,8 @@ f.EXAMINATION, f.NUMBEROFEXAMS, f.EXAMTYPE, - f.CLASS_ID + f.CLASS_ID, + f.AUTOEXAM @@ -106,7 +107,8 @@ EXAMINATION, ISFACE, EXAMTYPE, - CLASS_ID + CLASS_ID, + AUTOEXAM @@ -154,7 +156,8 @@ #{EXAMINATION}, #{ISFACE}, #{EXAMTYPE}, - #{CLASS_ID} + #{CLASS_ID}, + #{AUTOEXAM} @@ -288,6 +291,9 @@ EXAMTYPE = #{EXAMTYPE}, + + AUTOEXAM = #{AUTOEXAM}, + CLASS_ID = CLASS_ID where CLASS_ID = #{CLASS_ID}