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/ExamRoomServiceImpl.java

@@ -285,6 +285,9 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		if(Objects.isNull(examinationBasic)){
 			throw new BizException("考级项目不存在");
 		}
+		if(ExamStatusEnum.RESULT_CONFIRM.equals(examinationBasic.getStatus())){
+			throw new BizException("考级结果已确认");
+		}
 
 		ExamOrganizationRelation examOrganizationRelation = examOrganizationRelationDao.getExamOrganizationRelation(existExamRoom.getExaminationBasicId(), examRoom.getOrganId());
 		if(Objects.isNull(examOrganizationRelation)||examOrganizationRelation.getIsAllowArrangeExam()==0){

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

@@ -219,6 +219,13 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
         if(ExamStatusEnum.DELETE.equals(statusEnum)){
             examLifecycleLogDao.insert(new ExamLifecycleLog(existsExam.getId().intValue(), "删除考级项目", operatorId));
         }else if(ExamStatusEnum.RESULT_CONFIRM.equals(statusEnum)){
+            ExamRoomExamTimeDto examRoomExamTime = examRoomDao.getExamRoomExamTime(examId);
+            if(Objects.isNull(examRoomExamTime)){
+                throw new BizException("考试数据异常");
+            }
+            if(new Date().compareTo(examRoomExamTime.getExamEndTime())<=0){
+                throw new BizException("请等待所有考场完成考试");
+            }
             int noResultStudentNum = studentExamResultDao.countExamNoResultStudentNum(examId);
             if(noResultStudentNum>0){
                 throw new BizException("尚有考生考试结果未确认");

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

@@ -182,7 +182,6 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 			}
 			List<ExamReview> reviews = registReviewMap.get(studentExamResult.getExamRegistrationId());
 			if(CollectionUtils.isEmpty(reviews)){
-				studentExamResult.setAvgScore((float) 0);
 				continue;
 			}
 			reviews = reviews.stream().filter(e->Objects.nonNull(e.getEvaluationResult())).collect(Collectors.toList());

edu-user/edu-user-biz/src/main/resources/config/mybatis/StudentExamResultMapper.xml

@@ -294,6 +294,7 @@
 		SELECT * FROM student_exam_result WHERE exam_room_id_=#{examRoomId}
     </select>
 	<select id="countExamNoResultStudentNum" resultType="int">
-		SELECT COUNT(exam_registration_id_) FROM student_exam_result WHERE examination_basic_id_=#{examId} AND result_ IS NULL
+		SELECT COUNT(exam_registration_id_) FROM student_exam_result
+		WHERE examination_basic_id_=#{examId} AND is_finished_exam_=5 AND result_ IS NULL
 	</select>
 </mapper>