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

@@ -171,7 +171,7 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 		if(Objects.isNull(examinationBasic)){
 			throw new BizException("考级项目不存在");
 		}
-		if(!ExamStatusEnum.EXAM_END.equals(examinationBasic.getStatus())&&!ExamStatusEnum.RESULT_CONFIRM.equals(examinationBasic.getStatus())){
+		if(examinationBasic.getStatus().getOrder()>ExamStatusEnum.APPLIED.getOrder()){
 			return null;
 		}
 		List<Integer> childOrganIds = organizationService.getChildOrganIds(organId, true);

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

@@ -184,9 +184,9 @@
 			<if test="resultConfirm!=null and resultConfirm==0">
 				AND eb.status_='EXAM_END'
 			</if>
-			<if test="resultConfirm==null">
-				AND eb.status_ IN ('EXAM_END','RESULT_CONFIRM')
-			</if>
+			<!--<if test="resultConfirm==null">-->
+				<!--AND eb.status_ IN ('EXAM_ING', 'EXAM_END','RESULT_CONFIRM')-->
+			<!--</if>-->
 		</where>
 	</sql>