Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/StudentExamResultServiceImpl.java

@@ -131,8 +131,8 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 		if(Objects.isNull(examRoom)){
 			throw new BizException("考场信息异常");
 		}
-		if(Objects.isNull(oldStudentExamResult.getAvgScore())&& ExamModeEnum.ONLINE.equals(examRoom.getExamMode())){
-			throw new BizException("考试未结束");
+		if(oldStudentExamResult.getIsFinishedExam()!=5 && ExamModeEnum.ONLINE.equals(examRoom.getExamMode())){
+			throw new BizException("此考生未完成考试，暂不可修改考试结果");
 		}
 		if(ExamModeEnum.OFFLINE.equals(examRoom.getExamMode())){
 			studentExamResult.setIsFinishedExam(5);
@@ -170,7 +170,13 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 			}
 			String examName = examIdNameMap.get(studentExamResult.getExaminationBasicId());
 			String subjectName = subjectIdNameMap.get(studentExamResult.getExamRegistration().getSubjectId());
+			if(StringUtils.isBlank(subjectName)){
+				subjectName="";
+			}
 			String level = LevelEnum.getMsg(studentExamResult.getExamRegistration().getLevel());
+			if(StringUtils.isBlank(level)){
+				level = "";
+			}
 
 			Map<Integer, String> userPhoneMap = new HashMap<>();
 			userPhoneMap.put(studentExamResult.getStudentId(), studentExamResult.getStudentId().toString());