|
@@ -209,8 +209,8 @@ public class ExamStudentController {
|
|
obj.accumulate("answers", student.getAnswers() == null ? "" : student.getAnswers());
|
|
obj.accumulate("answers", student.getAnswers() == null ? "" : student.getAnswers());
|
|
obj.accumulate("upload", student.isUpload());
|
|
obj.accumulate("upload", student.isUpload());
|
|
obj.accumulate("absent", student.isAbsent());
|
|
obj.accumulate("absent", student.isAbsent());
|
|
- obj.accumulate("objectiveScore", student.getObjectiveScore());
|
|
|
|
- obj.accumulate("subjectiveScore", student.getSubjectiveScore());
|
|
|
|
|
|
+ obj.accumulate("objectiveScore", student.getObjectiveScore()==null?"":student.getObjectiveScore());
|
|
|
|
+ obj.accumulate("subjectiveScore", student.getSubjectiveScore()==null?"":student.getSubjectiveScore());
|
|
Campus campus = campusService.findBySchoolAndName(exam.getSchoolId(), student.getCampusName());
|
|
Campus campus = campusService.findBySchoolAndName(exam.getSchoolId(), student.getCampusName());
|
|
obj.accumulate("campusCode", campus != null ? campus.getId().toString() : "");
|
|
obj.accumulate("campusCode", campus != null ? campus.getId().toString() : "");
|
|
array.add(obj);
|
|
array.add(obj);
|