|
@@ -66,7 +66,7 @@ public class ExamSubjectScoreServiceImpl extends MPJBaseServiceImpl<ExamSubjectS
|
|
|
.like(StrUtil.isNotEmpty(dto.getStudentName()), User::getName, dto.getStudentName())
|
|
.like(StrUtil.isNotEmpty(dto.getStudentName()), User::getName, dto.getStudentName())
|
|
|
.like(StrUtil.isNotEmpty(dto.getCredentialNumber()), User::getCredentialNumber, dto.getCredentialNumber())
|
|
.like(StrUtil.isNotEmpty(dto.getCredentialNumber()), User::getCredentialNumber, dto.getCredentialNumber())
|
|
|
.isNotNull(dto.getIsEnter() != null && dto.getIsEnter() == 1, ExamSubjectScore::getScore)
|
|
.isNotNull(dto.getIsEnter() != null && dto.getIsEnter() == 1, ExamSubjectScore::getScore)
|
|
|
- .isNull(dto.getIsEnter() != null && dto.getIsEnter() == 1, ExamSubjectScore::getScore)
|
|
|
|
|
|
|
+ .isNull(dto.getIsEnter() != null && dto.getIsEnter() == 0, ExamSubjectScore::getScore)
|
|
|
.eq(dto.getExamSubjectScoreEnterId() != null, ExamSubjectScore::getExamSubjectScoreEnterId, dto.getExamSubjectScoreEnterId())
|
|
.eq(dto.getExamSubjectScoreEnterId() != null, ExamSubjectScore::getExamSubjectScoreEnterId, dto.getExamSubjectScoreEnterId())
|
|
|
);
|
|
);
|
|
|
return result;
|
|
return result;
|
|
@@ -90,10 +90,10 @@ public class ExamSubjectScoreServiceImpl extends MPJBaseServiceImpl<ExamSubjectS
|
|
|
.like(StrUtil.isNotEmpty(dto.getStudentName()), User::getName, dto.getStudentName())
|
|
.like(StrUtil.isNotEmpty(dto.getStudentName()), User::getName, dto.getStudentName())
|
|
|
.like(StrUtil.isNotEmpty(dto.getCredentialNumber()), User::getCredentialNumber, dto.getCredentialNumber())
|
|
.like(StrUtil.isNotEmpty(dto.getCredentialNumber()), User::getCredentialNumber, dto.getCredentialNumber())
|
|
|
.isNotNull(dto.getIsEnter() != null && dto.getIsEnter() == 1, ExamSubjectScore::getScore)
|
|
.isNotNull(dto.getIsEnter() != null && dto.getIsEnter() == 1, ExamSubjectScore::getScore)
|
|
|
- .isNull(dto.getIsEnter() != null && dto.getIsEnter() == 1, ExamSubjectScore::getScore)
|
|
|
|
|
|
|
+ .isNull(dto.getIsEnter() != null && dto.getIsEnter() == 0, ExamSubjectScore::getScore)
|
|
|
.eq(dto.getExamSubjectScoreEnterId() != null, ExamSubjectScore::getExamSubjectScoreEnterId, dto.getExamSubjectScoreEnterId())
|
|
.eq(dto.getExamSubjectScoreEnterId() != null, ExamSubjectScore::getExamSubjectScoreEnterId, dto.getExamSubjectScoreEnterId())
|
|
|
);
|
|
);
|
|
|
- PageOutput<ExamSubjectScoreEnterImportVo> pageOutput = ConventPage.getPageOutput(page, ExamSubjectScoreEnterImportVo.class);
|
|
|
|
|
|
|
+ PageOutput<ExamSubjectScoreEnterImportVo> pageOutput = ConventPage.getPageOutput(voIPage, ExamSubjectScoreEnterImportVo.class);
|
|
|
return pageOutput;
|
|
return pageOutput;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|