|
|
@@ -16,6 +16,7 @@ import java.util.regex.Pattern;
|
|
|
import java.util.stream.Collectors;
|
|
|
import java.util.stream.Stream;
|
|
|
|
|
|
+import com.netflix.infix.lang.infix.antlr.EventFilterParser.boolean_expr_return;
|
|
|
import com.qmth.cqb.base.dao.CourseRepo;
|
|
|
import com.qmth.cqb.base.model.Course;
|
|
|
import com.qmth.cqb.question.dao.CoursePropertyRepo;
|
|
|
@@ -809,6 +810,7 @@ public class ImportPaperService {
|
|
|
int i = 0;
|
|
|
// 是否刚刚检测到答案内容
|
|
|
boolean answerStart = false;
|
|
|
+ boolean hasAnswer = false;
|
|
|
|
|
|
for (i = index; i < pList.size(); i++) {
|
|
|
P pAnswer = (P) pList.get(i);
|
|
|
@@ -838,6 +840,7 @@ public class ImportPaperService {
|
|
|
answerHTML.append(DocxProcessUtil.docx2Html(tmpWordMl, wordMLPackage));
|
|
|
}
|
|
|
}
|
|
|
+ hasAnswer = true;
|
|
|
answerStart = true;
|
|
|
} else if (tmpText.startsWith(ImportPaperMsg.subQuesScore_word)) {
|
|
|
// 检测到分数开始段落
|
|
|
@@ -889,7 +892,7 @@ public class ImportPaperService {
|
|
|
}
|
|
|
importPaperCheck.setIndex(i);
|
|
|
//如果没有答案字段，抛出异常
|
|
|
- if(!answerStart){
|
|
|
+ if(!hasAnswer){
|
|
|
if(paperDetailUnit.getQuestionType() == QuesStructType.NESTED_ANSWER_QUESTION){
|
|
|
importPaperCheck.setErrorInfo(paperDetailUnit.getPaperDetail().getName()+"中，第"+paperDetailUnit.getNumber()+"个套题的" +subQuesNum+"小题中,缺失“[答案]”");
|
|
|
}else {
|
weiwenhai