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

@@ -885,10 +885,9 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		}
 		examRoom.setOpenFlag(0);
 		examRoom.setExamFlag(0);
-//		imFeignService.dismissGroup(examRoom.getMainTeacherUserId().toString(),examRoomId.toString());
-		imFeignService.destroyRoom(examRoomId,examRoom.getMainTeacherUserId().toString());
 		examRoomDao.update(examRoom);
 		studentExamResultService.calculateStudentExamAvgScore(examRoomId);
+		imFeignService.destroyRoom(examRoomId,examRoom.getMainTeacherUserId().toString());
 		return BaseController.succeed();
 	}
 
@@ -900,8 +899,8 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		for (ExamRoom examRoom : examRooms) {
 			examRoom.setOpenFlag(0);
 			examRoom.setExamFlag(0);
-			imFeignService.destroyRoom(examRoom.getId(),examRoom.getMainTeacherUserId().toString());
 			studentExamResultService.calculateStudentExamAvgScore(examRoom.getId());
+			imFeignService.destroyRoom(examRoom.getId(),examRoom.getMainTeacherUserId().toString());
 		}
 		if(!CollectionUtils.isEmpty(examRooms)){
 			examRoomDao.batchUpdate(examRooms);