|
@@ -97,19 +97,6 @@ public class MarkTaskApi {
|
|
if (!Objects.isNull(batchNo)) {
|
|
if (!Objects.isNull(batchNo)) {
|
|
predicates.add(builder.equal(root.get("batchNo"), batchNo));
|
|
predicates.add(builder.equal(root.get("batchNo"), batchNo));
|
|
}
|
|
}
|
|
-// if (Objects.nonNull(scoreConfig) && scoreConfig.isEnable()) {
|
|
|
|
-// if (Objects.nonNull(scoreConfig) && Objects.nonNull(scoreConfig.getExclude()) && scoreConfig.getExclude().size() > 0) {
|
|
|
|
-// Expression<String> exp = root.get("paper").get("level");
|
|
|
|
-// predicates.add(exp.in(scoreConfig.getExclude()));
|
|
|
|
-// } else {
|
|
|
|
-// ExamQuestion examQuestion = examQuestionRepo.findOne(questionId);
|
|
|
|
-// if (Objects.nonNull(examQuestion)) {
|
|
|
|
-// String maxLevel = levelRepo.findMaxCodeByWorkId(examQuestion.getWorkId());
|
|
|
|
-// Expression<String> exp = root.get("paper").get("level");
|
|
|
|
-// predicates.add(exp.in(maxLevel));
|
|
|
|
-// }
|
|
|
|
-// }
|
|
|
|
-// }
|
|
|
|
predicates.add(builder.isNotNull(root.get("result")));
|
|
predicates.add(builder.isNotNull(root.get("result")));
|
|
}
|
|
}
|
|
if (isSample != null) {
|
|
if (isSample != null) {
|