Merge remote-tracking branch 'origin/master'

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/core/provider/PhoneAuthenticationProvider.java

@@ -54,6 +54,9 @@ public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider
 		if (userInfo == null && StringUtils.isNotEmpty(loginEntity.getRegisterFlag())) {
 			sysUserService.initUser(loginEntity);
 		}
+		if (userInfo == null) {
+			throw new InternalAuthenticationServiceException("账户不存在");
+		}
 
 		UserDetails loadedUser;
 		try {

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dto/StudentExamListDto.java

@@ -4,14 +4,13 @@ import com.keao.edu.user.api.enums.ExamEvaluationResultEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 public class StudentExamListDto{
     @ApiModelProperty(value = "实际考试开始时间")
-    private java.util.Date actualExamStartTime;
+    private String actualExamStartTime;
 
     @ApiModelProperty(value = "实际考试结束时间")
-    private java.util.Date actualExamEndTime;
+    private String actualExamEndTime;
 
     @ApiModelProperty(value = "考试项目名称")
     private String examBaseName;
@@ -74,19 +73,19 @@ public class StudentExamListDto{
         this.subjectId = subjectId;
     }
 
-    public Date getActualExamStartTime() {
+    public String getActualExamStartTime() {
         return actualExamStartTime;
     }
 
-    public void setActualExamStartTime(Date actualExamStartTime) {
+    public void setActualExamStartTime(String actualExamStartTime) {
         this.actualExamStartTime = actualExamStartTime;
     }
 
-    public Date getActualExamEndTime() {
+    public String getActualExamEndTime() {
         return actualExamEndTime;
     }
 
-    public void setActualExamEndTime(Date actualExamEndTime) {
+    public void setActualExamEndTime(String actualExamEndTime) {
         this.actualExamEndTime = actualExamEndTime;
     }
 

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamCertificationMapper.xml

@@ -135,7 +135,7 @@
 		FROM exam_room_student_relation ersr
 		LEFT JOIN exam_certification ec ON ec.exam_registration_id_ = ersr.exam_registration_id_
 		LEFT JOIN student_exam_result ser ON ser.exam_registration_id_ = ersr.exam_registration_id_
-		WHERE ersr.student_id_ = #{studentId}
+		WHERE ser.is_finished_exam_ != 5 AND ersr.student_id_ = #{studentId}
 		<if test="examRegistrationId != null">
 			AND ersr.exam_registration_id_ = #{examRegistrationId}
 		</if>

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationMapper.xml

@@ -520,8 +520,8 @@
 		<result property="cardNo" column="card_no_"/>
 	</resultMap>
 	<select id="queryExamList" resultMap="ExamRecordDtoMap">
-		SELECT er.level_,ser.exam_registration_id_,eb.name_ exam_base_name_,eb.actual_exam_start_time_,
-		eb.actual_exam_end_time_,ser.avg_score_,ec.exam_address_,ec.id_ exam_certification_id_,
+		SELECT er.level_,ser.exam_registration_id_,eb.name_ exam_base_name_,DATE_FORMAT(eb.actual_exam_start_time_, '%Y-%m-%d') actual_exam_start_time_,
+		DATE_FORMAT(eb.actual_exam_end_time_, '%Y-%m-%d') actual_exam_end_time_,ser.avg_score_,ec.exam_address_,ec.id_ exam_certification_id_,
 		er.examination_basic_id_,er.exam_music_theory_level_,ser.is_finished_exam_,er.theory_level_fee_,
 		ser.video_url_,ser.result_,er.subject_id_,ec.card_no_
 		FROM exam_registration er