|
@@ -24,6 +24,7 @@ import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
|
|
import cn.com.qmth.examcloud.core.questions.base.Model;
|
|
import cn.com.qmth.examcloud.core.questions.base.Model;
|
|
import cn.com.qmth.examcloud.core.questions.base.enums.PaperStructType;
|
|
import cn.com.qmth.examcloud.core.questions.base.enums.PaperStructType;
|
|
import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
|
|
import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
|
|
|
|
+import cn.com.qmth.examcloud.core.questions.base.enums.QuestionDifficulty;
|
|
import cn.com.qmth.examcloud.core.questions.base.exception.QuesNotEnoughException;
|
|
import cn.com.qmth.examcloud.core.questions.base.exception.QuesNotEnoughException;
|
|
import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
|
|
import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
|
|
import cn.com.qmth.examcloud.core.questions.dao.PaperDetailRepo;
|
|
import cn.com.qmth.examcloud.core.questions.dao.PaperDetailRepo;
|
|
@@ -223,7 +224,7 @@ public class GenPaperService {
|
|
List<String> quesNames = uc.getUnitStruct().getQuesNames();
|
|
List<String> quesNames = uc.getUnitStruct().getQuesNames();
|
|
if (quesNames != null && quesNames.size() > 0) {
|
|
if (quesNames != null && quesNames.size() > 0) {
|
|
if (quesNames.contains(question.getQuesName()) && !uc.finish() && (uc.getUnitStruct().getQuestionType() == question.getQuestionType())) {
|
|
if (quesNames.contains(question.getQuesName()) && !uc.finish() && (uc.getUnitStruct().getQuestionType() == question.getQuestionType())) {
|
|
- if("all".equals(uc.getUnitStruct().getDifficulty())) {//难度不限
|
|
|
|
|
|
+ if(QuestionDifficulty.ANY.getName().equals(uc.getUnitStruct().getDifficulty())) {//难度不限
|
|
if (question.getPublicity().equals(uc.getUnitStruct().getPublicity())) {
|
|
if (question.getPublicity().equals(uc.getUnitStruct().getPublicity())) {
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|