|
@@ -272,13 +272,19 @@ public class ExamStudentServiceImpl implements ExamStudentService {
|
|
|
if (ExamType.ONLINE.name().equals(examType)) {
|
|
|
sql.append(" and finished = " + query.getFinished());
|
|
|
} else if (ExamType.OFFLINE.name().equals(examType)) {
|
|
|
- if (query.getFinished() == 0) { //未抽题
|
|
|
- sql.append(" and finished = 0");
|
|
|
- } else if (query.getFinished() == 1) { //已抽题未上传
|
|
|
- sql.append(" and finished = 1 and not exists (select id from ec_oe_exam_record_4_marking t2 where t1.exam_student_id = t2.exam_student_id)");
|
|
|
- } else if (query.getFinished() == 2) { //已抽题已上传
|
|
|
- sql.append(" and finished = 1 and exists (select id from ec_oe_exam_record_4_marking t2 where t1.exam_student_id = t2.exam_student_id)");
|
|
|
+ //如果忽略是否上传答案时,只要是已抽题则认为已参加考试
|
|
|
+ if (true==query.getIgnoreUploadOfflineAnswer()){
|
|
|
+ sql.append(" and finished = " + query.getFinished());
|
|
|
+ }else {
|
|
|
+ if (query.getFinished() == 0) { //未抽题
|
|
|
+ sql.append(" and finished = 0");
|
|
|
+ } else if (query.getFinished() == 1) { //已抽题未上传
|
|
|
+ sql.append(" and finished = 1 and not exists (select id from ec_oe_exam_record_4_marking t2 where t1.exam_student_id = t2.exam_student_id)");
|
|
|
+ } else if (query.getFinished() == 2) { //已抽题已上传
|
|
|
+ sql.append(" and finished = 1 and exists (select id from ec_oe_exam_record_4_marking t2 where t1.exam_student_id = t2.exam_student_id)");
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
return sql;
|