update

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/ExamRoom.java

@@ -22,16 +22,25 @@ public class ExamRoom {
 	
 	@ApiModelProperty(value = "考点编号")
 	private Integer examLocationId;
-	
+
+	@ApiModelProperty(value = "考试专业名称")
+	private String subjectNameList;
+
 	@ApiModelProperty(value = "考试专业")
 	private String subjectIdList;
 	
 	@ApiModelProperty(value = "主考老师编号")
 	private Integer mainTeacherUserId;
+
+	@ApiModelProperty(value = "主考老师名称")
+	private String mainTeacherName;
 	
 	@ApiModelProperty(value = "助考老师（多个用逗号分隔）")
 	private String assistantTeacherUserIdList;
 
+	@ApiModelProperty(value = "助考老师名称")
+	private String assistantTeacherUserNameList;
+
 	@ApiModelProperty(value = "考试时间:[{'examStartTime':'','examEndTime':''}]")
 	private String examTimeJson;
 	
@@ -90,7 +99,31 @@ public class ExamRoom {
 	public Integer getExamLocationId(){
 		return this.examLocationId;
 	}
-			
+
+	public String getMainTeacherName() {
+		return mainTeacherName;
+	}
+
+	public void setMainTeacherName(String mainTeacherName) {
+		this.mainTeacherName = mainTeacherName;
+	}
+
+	public String getAssistantTeacherUserNameList() {
+		return assistantTeacherUserNameList;
+	}
+
+	public void setAssistantTeacherUserNameList(String assistantTeacherUserNameList) {
+		this.assistantTeacherUserNameList = assistantTeacherUserNameList;
+	}
+
+	public String getSubjectNameList() {
+		return subjectNameList;
+	}
+
+	public void setSubjectNameList(String subjectNameList) {
+		this.subjectNameList = subjectNameList;
+	}
+
 	public void setSubjectIdList(String subjectIdList){
 		this.subjectIdList = subjectIdList;
 	}

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/ExamRoomStudentRelation.java

@@ -13,6 +13,9 @@ public class ExamRoomStudentRelation {
 
 	@ApiModelProperty(value = "考级项目编号")
 	private Integer examinationBasicId;
+
+	@ApiModelProperty(value = "学员报名编号")
+	private Long examRegistrationId;
 	
 	@ApiModelProperty(value = "考试教室编号")
 	private Long examRoomId;
@@ -52,7 +55,15 @@ public class ExamRoomStudentRelation {
 	public Integer getExaminationBasicId(){
 		return this.examinationBasicId;
 	}
-			
+
+	public Long getExamRegistrationId() {
+		return examRegistrationId;
+	}
+
+	public void setExamRegistrationId(Long examRegistrationId) {
+		this.examRegistrationId = examRegistrationId;
+	}
+
 	public void setExamRoomId(Long examRoomId){
 		this.examRoomId = examRoomId;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRoomController.java

@@ -1,7 +1,5 @@
 package com.keao.edu.user.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.controller.BaseController;
@@ -14,13 +12,12 @@ import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.page.ExamRoomQueryInfo;
 import com.keao.edu.user.service.EmployeeService;
 import com.keao.edu.user.service.ExamRoomService;
-import com.netflix.discovery.converters.Auto;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Objects;
 
 @RestController
@@ -94,4 +91,10 @@ public class ExamRoomController extends BaseController {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         return succeed(examRoomService.getExamRoomStatisticsInfo(sysUser.getId(), examId));
     }
+
+    @ApiOperation("获取报名学员可加入教室列表")
+    @GetMapping(value = "/getStudentEnableJoinRoom")
+    public HttpResponseResult<List<ExamRoom>> getStudentEnableJoinRoom(Long registId){
+        return succeed(examRoomService.getStudentEnableJoinRoom(registId));
+    }
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRoomStudentRelationController.java

@@ -53,6 +53,13 @@ public class ExamRoomStudentRelationController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation("更换学员考场")
+    @PostMapping(value = "/changeStudentExamRoom")
+    public HttpResponseResult changeStudentExamRoom(Long registId, Long examRoomId){
+        examRoomStudentRelationService.changeStudentExamRoom(registId, examRoomId);
+        return succeed();
+    }
+
     @ApiOperation("获取教室学员")
     @GetMapping(value = "/findExamRoomStudents")
     public HttpResponseResult<PageInfo<ExamRoomStudentRelationDto>> findExamRoomStudents(ExamRoomStudentRelationQueryInfo queryInfo){

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamRoomDao.java

@@ -58,4 +58,15 @@ public interface ExamRoomDao extends BaseDAO<Long, ExamRoom> {
      * @return java.util.List<com.keao.edu.user.api.entity.ExamRoom>
      */
     List<ExamRoom> getWithDays(@Param("days") List<String> days);
+
+    /**
+     * @describe 根据专业获取指定考级项目下可选择教室
+     * @author Joburgess
+     * @date 2020.07.08
+     * @param examId:
+     * @param subjectId:
+     * @return java.util.List<com.keao.edu.user.api.entity.ExamRoom>
+     */
+    List<ExamRoom> getWithExamAndSubject(@Param("examId") Integer examId,
+                                         @Param("subjectId") Integer subjectId);
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamRoomStudentRelationDao.java

@@ -70,4 +70,12 @@ public interface ExamRoomStudentRelationDao extends BaseDAO<Long, ExamRoomStuden
      */
     List<ExamRoomStudentRelation> getExamRoomStudentRelations(@Param("basicId") Integer basicId, @Param("roomId") String roomId, @Param("studentId") Integer studentId);
 
+    /**
+     * @describe 获取报名学员所在教室
+     * @author Joburgess
+     * @date 2020.07.08
+     * @param registId:
+     * @return com.keao.edu.user.api.entity.ExamRoomStudentRelation
+     */
+    ExamRoomStudentRelation getStudentExamRoom(@Param("registId") Long registId);
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRoomService.java

@@ -72,4 +72,13 @@ public interface ExamRoomService extends BaseService<Long, ExamRoom> {
      * @return void
      */
     void checkRoomTeachers(List<ExamRoom> examRooms);
+
+    /**
+     * @describe 获取报名学员可加入教室列表
+     * @author Joburgess
+     * @date 2020.07.08
+     * @param registId:
+     * @return java.util.List<com.keao.edu.user.api.entity.ExamRoom>
+     */
+    List<ExamRoom> getStudentEnableJoinRoom(Long registId);
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRoomStudentRelationService.java

@@ -27,6 +27,16 @@ public interface ExamRoomStudentRelationService extends BaseService<Long, ExamRo
     void addStudentForRoom(Long examRoomId, String studentIds);
 
     /**
+     * @describe 更换学员考场
+     * @author Joburgess
+     * @date 2020.07.08
+     * @param registId:
+     * @param examRoomId:
+     * @return void
+     */
+    void changeStudentExamRoom(Long registId, Long examRoomId);
+
+    /**
      * @describe 获取教室学员
      * @author Joburgess
      * @date 2020.06.24

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRoomServiceImpl.java

@@ -15,6 +15,7 @@ import com.keao.edu.user.dao.*;
 import com.keao.edu.user.dto.ExamRoomDto;
 import com.keao.edu.user.dto.ExamRoomStatisticsDto;
 import com.keao.edu.user.api.enums.ExamModeEnum;
+import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.entity.ExaminationBasic;
 import com.keao.edu.user.page.ExamRoomQueryInfo;
 import com.keao.edu.user.service.ExamRoomService;
@@ -254,4 +255,16 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 			}
 		}
 	}
+
+	@Override
+	public List<ExamRoom> getStudentEnableJoinRoom(Long registId) {
+		if(Objects.isNull(registId)){
+			throw new BizException("请指定报名信息");
+		}
+		ExamRegistration examRegistration = examRegistrationDao.get(registId);
+		if(Objects.isNull(examRegistration)){
+			throw new BizException("报名信息不存在");
+		}
+		return examRoomDao.getWithExamAndSubject(examRegistration.getExaminationBasicId(), examRegistration.getSubjectId());
+	}
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRoomStudentRelationServiceImpl.java

@@ -2,18 +2,18 @@ package com.keao.edu.user.service.impl;
 
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.common.enums.YesOrNoEnum;
 import com.keao.edu.common.exception.BizException;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.IdGeneratorService;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.common.tenant.TenantContextHolder;
 import com.keao.edu.user.api.entity.ExamRoom;
+import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
 import com.keao.edu.user.dao.*;
 import com.keao.edu.user.dto.ExamRoomStudentRelationDto;
-import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
 import com.keao.edu.user.entity.*;
 import com.keao.edu.user.page.ExamRoomStudentRelationQueryInfo;
-import com.keao.edu.user.service.ExamCertificationService;
 import com.keao.edu.user.service.ExamRoomStudentRelationService;
 import com.keao.edu.user.service.ExamTeacherSalaryService;
 import com.keao.edu.user.service.OrganizationService;
@@ -134,6 +134,38 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void changeStudentExamRoom(Long registId, Long examRoomId) {
+		if(Objects.isNull(registId)){
+			throw new BizException("请指定报名信息");
+		}
+		if(Objects.isNull(examRoomId)){
+			throw new BizException("请指定新考场");
+		}
+		ExamRegistration examRegistration = examRegistrationDao.get(registId);
+		if(Objects.isNull(examRegistration)){
+			throw new BizException("学员报名信息不存在");
+		}
+		ExamRoom examRoom = examRoomDao.get(examRoomId);
+		if(Objects.isNull(examRoom)){
+			throw new BizException("考场信息不存在");
+		}
+		ExamRoomStudentRelation studentExamRoom = examRoomStudentRelationDao.getStudentExamRoom(registId);
+		if(Objects.isNull(studentExamRoom)){
+			studentExamRoom=new ExamRoomStudentRelation();
+			studentExamRoom.setExaminationBasicId(examRegistration.getExaminationBasicId());
+			studentExamRoom.setExamRoomId(examRoomId);
+			studentExamRoom.setExamRegistrationId(examRegistration.getId().longValue());
+			studentExamRoom.setStudentId(examRegistration.getStudentId());
+			studentExamRoom.setClassroomSwitch(YesOrNoEnum.NO);
+			examRoomStudentRelationDao.insert(studentExamRoom);
+			return;
+		}
+		studentExamRoom.setExamRoomId(examRoomId);
+		examRoomStudentRelationDao.update(studentExamRoom);
+	}
+
+	@Override
 	public PageInfo<ExamRoomStudentRelationDto> findExamRoomStudents(ExamRoomStudentRelationQueryInfo queryInfo) {
 		PageInfo<ExamRoomStudentRelationDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();

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

@@ -271,10 +271,10 @@
 			COUNT(ersr.id_)
 		FROM
 			exam_room_student_relation ersr
-		LEFT JOIN exam_registration er ON ersr.student_id_ = er.student_id_ AND er.examination_basic_id_=ersr.examination_basic_id_
+		LEFT JOIN exam_registration er ON ersr.exam_registration_id_ = er.id_
 		WHERE 1=1
 		<if test="organIds!=null">
-			er.organ_id_ IN
+			AND er.organ_id_ IN
 			<foreach collection="organIds" item="organI" separator="," open="(" close=")">
 				#{organI}
 			</foreach>

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

@@ -12,8 +12,11 @@
 		<result column="exam_mode_" property="examMode" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
 		<result column="exam_location_id_" property="examLocationId" />
 		<result column="subject_id_list_" property="subjectIdList" />
+		<result column="subject_name_list_" property="subjectNameList"/>
 		<result column="main_teacher_user_id_" property="mainTeacherUserId" />
+		<result column="main_teacher_user_name_" property="mainTeacherName"/>
 		<result column="assistant_teacher_user_id_list_" property="assistantTeacherUserIdList" />
+		<result column="assistant_teacher_user_name_list_" property="assistantTeacherUserNameList"/>
 		<result column="exam_start_time_" property="examStartTime" />
 		<result column="exam_end_time_" property="examEndTime" />
 		<result column="del_flag_" property="delFlag" />
@@ -37,23 +40,26 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.api.entity.ExamRoom" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO exam_room (id_,examination_basic_id_,exam_mode_,exam_location_id_,subject_id_list_,main_teacher_user_id_,
-		assistant_teacher_user_id_list_,exam_start_time_,exam_end_time_,del_flag_,organ_id_,exam_plan_push_flag_,
+		INSERT INTO exam_room (id_,examination_basic_id_,exam_mode_,exam_location_id_,subject_id_list_,subject_name_list_,
+		main_teacher_user_id_,main_teacher_user_name_,assistant_teacher_user_id_list_,assistant_teacher_user_name_list_,
+		exam_start_time_,exam_end_time_,del_flag_,organ_id_,exam_plan_push_flag_,
 		exam_room_student_num_,create_time_,update_time_,tenant_id_)
-		VALUES(#{id},#{examinationBasicId},#{examMode,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{examLocationId},#{subjectIdList},
-		#{mainTeacherUserId},#{assistantTeacherUserIdList},
+		VALUES(#{id},#{examinationBasicId},#{examMode,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{examLocationId},
+		#{subjectIdList},#{subjectNameList},#{mainTeacherUserId},#{mainTeacherName},#{assistantTeacherUserIdList},#{assistantTeacherUserNameList},
 		#{examStartTime},#{examEndTime},#{delFlag},#{organId},#{examPlanPushFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 		#{examRoomStudentNum},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.keao.edu.user.api.entity.ExamRoom" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO exam_room (examination_basic_id_,exam_mode_,exam_location_id_,subject_id_list_,main_teacher_user_id_,
-		assistant_teacher_user_id_list_,exam_start_time_,exam_end_time_,del_flag_,organ_id_,exam_plan_push_flag_,
+		INSERT INTO exam_room (examination_basic_id_,exam_mode_,exam_location_id_,subject_id_list_,subject_name_list_,
+		main_teacher_user_id_,main_teacher_user_name_,assistant_teacher_user_id_list_,assistant_teacher_user_name_list_,
+		exam_start_time_,exam_end_time_,del_flag_,organ_id_,exam_plan_push_flag_,
 		exam_room_student_num_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="examRooms" item="examRoom" separator=",">
 			(#{examRoom.examinationBasicId},#{examRoom.examMode,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{examRoom.examLocationId},
-			#{examRoom.subjectIdList},#{examRoom.mainTeacherUserId},#{examRoom.assistantTeacherUserIdList},
+			#{examRoom.subjectIdList},#{examRoom.subjectNameList},
+			#{examRoom.mainTeacherUserId},#{examRoom.mainTeacherName},#{examRoom.assistantTeacherUserIdList},#{examRoom.assistantTeacherUserNameList},
 			#{examRoom.examStartTime},#{examRoom.examEndTime},#{examRoom.delFlag},#{examRoom.organId},#{examRoom.examPlanPushFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 			#{examRoom.examRoomStudentNum},NOW(),NOW(),#{examRoom.tenantId})
 		</foreach>
@@ -78,6 +84,9 @@
 			<if test="subjectIdList != null">
 				subject_id_list_ = #{subjectIdList},
 			</if>
+			<if test="subjectNameList != null">
+				subject_name_list_ = #{subjectNameList},
+			</if>
 			<if test="tenantId != null">
 				tenant_id_ = #{tenantId},
 			</if>
@@ -90,9 +99,15 @@
 			<if test="mainTeacherUserId != null">
 				main_teacher_user_id_ = #{mainTeacherUserId},
 			</if>
+			<if test="mainTeacherName != null">
+				main_teacher_user_name_ = #{mainTeacherName},
+			</if>
 			<if test="assistantTeacherUserIdList != null">
 				assistant_teacher_user_id_list_ = #{assistantTeacherUserIdList},
 			</if>
+			<if test="assistantTeacherUserNameList != null">
+				assistant_teacher_user_name_list_ = #{assistantTeacherUserNameList},
+			</if>
 			<if test="organId != null">
 				organ_id_ = #{organId},
 			</if>
@@ -124,6 +139,9 @@
 			<if test="subjectIdList != null">
 				subject_id_list_ = #{subjectIdList},
 			</if>
+			<if test="subjectNameList != null">
+				subject_name_list_ = #{subjectNameList},
+			</if>
 			<if test="tenantId != null">
 				tenant_id_ = #{tenantId},
 			</if>
@@ -136,9 +154,15 @@
 			<if test="mainTeacherUserId != null">
 				main_teacher_user_id_ = #{mainTeacherUserId},
 			</if>
+			<if test="mainTeacherName != null">
+				main_teacher_user_name_ = #{mainTeacherName},
+			</if>
 			<if test="assistantTeacherUserIdList != null">
 				assistant_teacher_user_id_list_ = #{assistantTeacherUserIdList},
 			</if>
+			<if test="assistantTeacherUserNameList != null">
+				assistant_teacher_user_name_list_ = #{assistantTeacherUserNameList},
+			</if>
 			<if test="organId != null">
 				organ_id_ = #{organId},
 			</if>
@@ -207,8 +231,8 @@
 	</sql>
 	
 	<resultMap type="com.keao.edu.user.dto.ExamRoomDto" id="ExamRoomDto" extends="ExamRoom">
-		<association property="examLocation" javaType="com.keao.edu.user.entity.ExamLocation" resultMap="com.keao.edu.user.dao.ExamLocationDao.ExamLocation"/>
-		<association property="examinationBasic" javaType="com.keao.edu.user.entity.ExaminationBasic" resultMap="com.keao.edu.user.dao.ExaminationBasicDao.ExaminationBasic"/>
+		<association property="examLocation" columnPrefix="el_" resultMap="com.keao.edu.user.dao.ExamLocationDao.ExamLocation"/>
+		<association property="examinationBasic" columnPrefix="exam_" resultMap="com.keao.edu.user.dao.ExaminationBasicDao.ExaminationBasic"/>
 	</resultMap>
 	
     <select id="countExamRoomPage" resultType="java.lang.Integer">
@@ -219,7 +243,12 @@
 	</select>
 	
 	<select id="queryExamRoomPage" resultMap="ExamRoomDto">
-		SELECT er.*,eb.* FROM exam_room er
+		SELECT
+			er.*,
+			el.id_ el_id_,
+			el.name_ el_name_,
+			eb.name_ exam_name_
+		FROM exam_room er
 		LEFT JOIN exam_location el ON er.exam_location_id_ = el.id_ AND er.tenant_id_ = el.tenant_id_
 		LEFT JOIN examination_basic eb ON FIND_IN_SET(er.exam_location_id_,eb.exam_location_id_list_) AND er.tenant_id_ = eb.tenant_id_
 		<include refid="queryExamRoomPageSql"/>
@@ -255,4 +284,7 @@
 				#{day}
 			</foreach>
 	</select>
+	<select id="getWithExamAndSubject" resultMap="ExamRoom">
+		SELECT * FROM exam_room WHERE examination_basic_id_=#{examId} AND FIND_IN_SET(#{subjectId}, subject_id_list_);
+	</select>
 </mapper>

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

@@ -9,6 +9,7 @@
 	<resultMap type="com.keao.edu.user.api.entity.ExamRoomStudentRelation" id="ExamRoomStudentRelation">
 		<result column="id_" property="id" />
 		<result column="examination_basic_id_" property="examinationBasicId" />
+		<result column="exam_registration_id_" property="examRegistrationId" />
 		<result column="exam_room_id_" property="examRoomId" />
 		<result column="student_id_" property="studentId" />
 		<result column="classroom_switch_" property="classroomSwitch" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
@@ -35,15 +36,15 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.api.entity.ExamRoomStudentRelation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO exam_room_student_relation (id_,examination_basic_id_,exam_room_id_,student_id_,create_time_,update_time_,tenant_id_)
-		VALUES(#{id},#{examinationBasicId},#{examRoomId},#{studentId},NOW(),NOW(),#{tenantId})
+		INSERT INTO exam_room_student_relation (id_,examination_basic_id_,exam_registration_id_,exam_room_id_,student_id_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{examinationBasicId},#{examRegistrationId},#{examRoomId},#{studentId},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.keao.edu.user.api.entity.ExamRoomStudentRelation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO exam_room_student_relation (examination_basic_id_,exam_room_id_,student_id_,create_time_,update_time_,tenant_id_)
+		INSERT INTO exam_room_student_relation (examination_basic_id_,exam_registration_id_,exam_room_id_,student_id_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="roomStudents" item="roomStudent" separator=",">
-			(#{roomStudent.examinationBasicId},#{roomStudent.examRoomId},#{roomStudent.studentId},NOW(),NOW(),#{roomStudent.tenantId})
+			(#{roomStudent.examinationBasicId},#{roomStudent.examRegistrationId},#{roomStudent.examRoomId},#{roomStudent.studentId},NOW(),NOW(),#{roomStudent.tenantId})
 		</foreach>
 	</insert>
 	
@@ -54,12 +55,12 @@
 			<if test="examinationBasicId != null">
 				examination_basic_id_ = #{examinationBasicId},
 			</if>
+			<if test="examRegistrationId != null">
+				exam_registration_id_ = #{examRegistrationId},
+			</if>
 			<if test="classroomSwitch != null">
 				classroom_switch_ = #{classroomSwitch,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 			</if>
-			<if test="id != null">
-				id_ = #{id},
-			</if>
 			<if test="tenantId != null">
 				tenant_id_ = #{tenantId},
 			</if>
@@ -169,4 +170,7 @@
 			AND student_id_ = #{studentId}
 		</if>
 	</select>
+    <select id="getStudentExamRoom" resultMap="ExamRoomStudentRelation">
+		SELECT * FROM exam_room_student_relation WHERE exam_registration_id_=#{registId}
+    </select>
 </mapper>

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

@@ -205,8 +205,7 @@
 
 	<select id="getExams" resultMap="ExaminationBasicDto">
 		SELECT * FROM examination_basic
-		WHERE status_ IN ('EXAM_END')
-		AND id_ IN
+		WHERE id_ IN
 		<foreach collection="examIds" item="examId" separator="," open="(" close=")">
 			#{examId}
 		</foreach>