|
@@ -493,7 +493,12 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
|
|
predicates.add(cb.equal(root.get("upload"), query.getUpload()));
|
|
predicates.add(cb.equal(root.get("upload"), query.getUpload()));
|
|
}
|
|
}
|
|
if (query.getAbsent() != null) {
|
|
if (query.getAbsent() != null) {
|
|
- predicates.add(cb.equal(root.get("absent"), query.getAbsent()));
|
|
|
|
|
|
+ if(query.getAbsent()){//缺考=缺考+ 未上传
|
|
|
|
+ predicates.add(cb.or(cb.equal(root.get("absent"),true),cb.equal(root.get("upload"),false)));
|
|
|
|
+ }else {
|
|
|
|
+ predicates.add(cb.equal(root.get("absent"), query.getAbsent()));
|
|
|
|
+ predicates.add(cb.equal(root.get("upload"), true));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
if (query.getBreach() != null) {
|
|
if (query.getBreach() != null) {
|
|
predicates.add(cb.equal(root.get("breach"), query.getBreach()));
|
|
predicates.add(cb.equal(root.get("breach"), query.getBreach()));
|