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

@@ -163,7 +163,8 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
                 continue;
             }
             if(Objects.nonNull(exam.getActualExamStartTime())
-                &&exam.getStatus().equals(ExamStatusEnum.APPLIED)
+                &&(exam.getStatus().equals(ExamStatusEnum.APPLIED)
+                    ||exam.getStatus().equals(ExamStatusEnum.EXAM_END))
                     &&now.compareTo(exam.getActualExamStartTime()) >= 0){
                 exam.setStatus(ExamStatusEnum.EXAM_ING);
             }

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

@@ -245,7 +245,7 @@
 	</select>
 
     <select id="getNeedUpdateStatusExams" resultMap="ExaminationBasic">
-		SELECT * FROM examination_basic WHERE status_ IN ('NOT_START', 'APPLYING', 'APPLIED', 'EXAM_ING')
+		SELECT * FROM examination_basic WHERE status_ IN ('NOT_START', 'APPLYING', 'APPLIED', 'EXAM_ING', 'EXAM_END')
 	</select>
 
 	<select id="getExams" resultMap="ExaminationBasicDto">