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

# Conflicts:
#	edu-user/edu-teacher-server/src/main/resources/application.yml

edu-user/edu-teacher-server/src/main/resources/application.yml

@@ -22,7 +22,7 @@ eureka:
 
 spring:
   application:
-    name: techer-server
+    name: teacher-server
 
   servlet:
     multipart:

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

@@ -177,6 +177,9 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 		List<ExamReview> examReviews = examReviewDao.getWithExamRoom(examRoomId);
 		Map<Long, List<ExamReview>> registReviewMap = examReviews.stream().collect(Collectors.groupingBy(ExamReview::getExamRegistrationId));
 		for (StudentExamResult studentExamResult : studentExamResults) {
+			if(studentExamResult.getIsFinishedExam()==3){
+				continue;
+			}
 			List<ExamReview> reviews = registReviewMap.get(studentExamResult.getExamRegistrationId());
 			if(CollectionUtils.isEmpty(reviews)){
 				studentExamResult.setAvgScore((float) 0);