|
@@ -297,14 +297,14 @@ public class ExamStudentController extends BaseApiController {
|
|
JSONObject obj = new JSONObject();
|
|
JSONObject obj = new JSONObject();
|
|
ExamStudent student = null;
|
|
ExamStudent student = null;
|
|
try {
|
|
try {
|
|
- if (Strings.isNullOrEmpty(examSeqCode)) {
|
|
|
|
- student = studentService.findBySchoolIdAndSubjectCodeAndStudentCode(schoolId, subjectCode, studentCode);
|
|
|
|
|
|
+ if (StringUtils.isNotBlank(examSeqCode)) {
|
|
|
|
+ student = studentService.findBySchoolIdAndSubjectCodeAndStudentCodeAndRemark(schoolId, subjectCode,
|
|
|
|
+ studentCode, examSeqCode);
|
|
} else if (examId != null) {
|
|
} else if (examId != null) {
|
|
- student = studentService.findByExamIdAndSchoolIdAndSubjectCodeAndStudentCode(examId, schoolId,
|
|
|
|
|
|
+ student = studentService.findBySchoolIdAndExamIdAndSubjectCodeAndStudentCode( schoolId,examId,
|
|
subjectCode, studentCode);
|
|
subjectCode, studentCode);
|
|
} else {
|
|
} else {
|
|
- student = studentService.findBySchoolIdAndSubjectCodeAndStudentCodeAndRemark(schoolId, subjectCode,
|
|
|
|
- studentCode, examSeqCode);
|
|
|
|
|
|
+ student = studentService.findBySchoolIdAndSubjectCodeAndStudentCode(schoolId, subjectCode, studentCode);
|
|
}
|
|
}
|
|
if (student != null) {
|
|
if (student != null) {
|
|
DecimalFormat df = new DecimalFormat("####.###");
|
|
DecimalFormat df = new DecimalFormat("####.###");
|