|
@@ -149,7 +149,7 @@ public class PaperApi {
|
|
@RequestParam(required = false) Boolean isRelate,
|
|
@RequestParam(required = false) Boolean isRelate,
|
|
@RequestParam(required = false) String studentName,
|
|
@RequestParam(required = false) String studentName,
|
|
@RequestParam(required = false) Long scanUserId,
|
|
@RequestParam(required = false) Long scanUserId,
|
|
- @RequestParam(required = false) Boolean isAdminMark,
|
|
|
|
|
|
+ @RequestParam(required = false) Boolean isMark,
|
|
@RequestParam(required = false) String sortBy,
|
|
@RequestParam(required = false) String sortBy,
|
|
Pageable pageable) {
|
|
Pageable pageable) {
|
|
Sort sort = null;
|
|
Sort sort = null;
|
|
@@ -188,8 +188,8 @@ public class PaperApi {
|
|
if (isRelate != null) {
|
|
if (isRelate != null) {
|
|
predicates.add(builder.equal(root.get("isRelate"), isRelate));
|
|
predicates.add(builder.equal(root.get("isRelate"), isRelate));
|
|
}
|
|
}
|
|
- if (isAdminMark != null) {
|
|
|
|
- predicates.add(builder.equal(root.get("isAdminMark"), isAdminMark));
|
|
|
|
|
|
+ if (isMark != null) {
|
|
|
|
+ predicates.add(builder.equal(root.get("isAdminMark"), isMark));
|
|
}
|
|
}
|
|
//考生姓名
|
|
//考生姓名
|
|
if (studentName != null && !studentName.equals("")) {
|
|
if (studentName != null && !studentName.equals("")) {
|