试卷判断

web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java

@@ -640,6 +640,8 @@ public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLo
         if(!isReSend) {
             GeneralQuestionLogQuery questionLogQuery = new GeneralQuestionLogQuery();
             questionLogQuery.setStudentId(studentId);
+            // 正在做题的话，再次进来如果这个试卷没提交，则继续做题，不会传生成新的题目
+            questionLogQuery.setQuestionLogAddType(PRE_SUBMIT);
             questionLogQuery.setGeneralQuestionSettingId(setting.getGeneralQuestionSettingId());
             questionLogQuery.setGeneralQuestionLogStatus(1);
             List<GeneralQuestionLog> existsList = getValuesByQueryNotWithPermission(questionLogQuery);

web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java

@@ -480,7 +480,7 @@ public class GeneralQuestionSettingService extends CoreBaseService<GeneralQuesti
             // 作答次数
             Integer generalQuestionSettingSettingDoCount = hwSetting.getGeneralQuestionSettingDoCount();
             Assert.isTrue(generalQuestionSettingSettingDoCount > 0, "作答次数设置有误，请联系管理员！");
-            // 数据库查询该学生已经做过的次数
+            // 数据库查询该学生已经做过的次数, 这个试卷如果已经交卷的话，就提示用户
             GeneralQuestionLog generalQuestionLog = new GeneralQuestionLog();
             generalQuestionLog.setStudentId(studentId);
             generalQuestionLog.setQuestionLogAddType(FINALLY_SUBMIT);

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java

@@ -452,6 +452,8 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
         if(!isReSend) {
             TeacherOpenCourseQuestionLogQuery questionLogQuery = new TeacherOpenCourseQuestionLogQuery();
             questionLogQuery.setStudentId(studentId);
+            // 正在做题的话，再次进来如果这个试卷没提交，则继续做题，不会传生成新的题目
+            questionLogQuery.setQuestionLogAddType(PRE_SUBMIT);
             questionLogQuery.setTeacherOpenCourseQuestionSettingId(setting.getTeacherOpenCourseQuestionSettingId());
             questionLogQuery.setTeacherOpenCourseQuestionLogStatus(1);
             List<TeacherOpenCourseQuestionLog> existsList = getValuesByQueryNotWithPermission(questionLogQuery);

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java

@@ -694,7 +694,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
             // 作答次数
             Integer teacherOpenCourseQuestionSettingSettingDoCount = hwSetting.getTeacherOpenCourseQuestionSettingDoCount();
             Assert.isTrue(teacherOpenCourseQuestionSettingSettingDoCount > 0, "作答次数设置有误，请联系管理员！");
-            // 数据库查询该学生已经做过的次数
+            // 数据库查询该学生已经做过的次数, 这个试卷如果已经交卷的话，就提示用户
             TeacherOpenCourseQuestionLog teacherOpenCourseQuestionLog = new TeacherOpenCourseQuestionLog();
             teacherOpenCourseQuestionLog.setStudentId(studentId);
             teacherOpenCourseQuestionLog.setQuestionLogAddType(FINALLY_SUBMIT);