update

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

@@ -1,6 +1,8 @@
 package com.keao.edu.user.api.entity;
 
 import com.keao.edu.common.enums.YesOrNoEnum;
+import com.keao.edu.user.api.enums.ExamModeEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Date;
@@ -10,29 +12,30 @@ import java.util.Date;
  */
 public class ExamRoom {
 
-	/**  */
 	private Long id;
 
+	@ApiModelProperty(value = "考级项目编号")
 	private Integer examinationBasicId;
 	
-	/** 考试模式（线上/线下） */
-	private String examMode;
+	@ApiModelProperty(value = "考试模式")
+	private ExamModeEnum examMode;
 	
-	/** 考点 */
+	@ApiModelProperty(value = "考点编号")
 	private Integer examLocationId;
 	
-	/** 考试专业（多选，逗号分隔） */
+	@ApiModelProperty(value = "考试专业")
 	private String subjectIdList;
 	
-	/** 主考老师 */
+	@ApiModelProperty(value = "主考老师编号")
 	private Integer mainTeacherUserId;
 	
-	/** 助考老师（多个用逗号分隔） */
+	@ApiModelProperty(value = "助考老师（多个用逗号分隔）")
 	private String assistantTeacherUserIdList;
 	
-	/** 考试时间 */
+	@ApiModelProperty(value = "考试开始时间")
 	private Date examStartTime;
 
+	@ApiModelProperty(value = "考试结束时间")
 	private Date examEndTime;
 
 	private Integer organId;
@@ -69,14 +72,14 @@ public class ExamRoom {
 		this.examinationBasicId = examinationBasicId;
 	}
 
-	public void setExamMode(String examMode){
-		this.examMode = examMode;
+	public ExamModeEnum getExamMode() {
+		return examMode;
 	}
-	
-	public String getExamMode(){
-		return this.examMode;
+
+	public void setExamMode(ExamModeEnum examMode) {
+		this.examMode = examMode;
 	}
-			
+
 	public void setExamLocationId(Integer examLocationId){
 		this.examLocationId = examLocationId;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/enums/ExamModeEnum.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/enums/ExamModeEnum.java

@@ -1,4 +1,4 @@
-package com.keao.edu.user.enums;
+package com.keao.edu.user.api.enums;
 
 import com.keao.edu.common.enums.BaseEnum;
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamTeacherSalary.java

@@ -1,8 +1,7 @@
 package com.keao.edu.user.entity;
 
 import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.user.enums.ExamModeEnum;
-import com.keao.edu.user.enums.SettlementTypeEnum;
+import com.keao.edu.user.api.enums.ExamModeEnum;
 import com.keao.edu.user.enums.TeacherSettlementTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExaminationBasic.java

@@ -1,6 +1,6 @@
 package com.keao.edu.user.entity;
 
-import com.keao.edu.user.enums.ExamModeEnum;
+import com.keao.edu.user.api.enums.ExamModeEnum;
 import com.keao.edu.user.enums.ExamStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

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

@@ -13,11 +13,10 @@ import com.keao.edu.user.dao.ExamRoomDao;
 import com.keao.edu.user.dao.ExamRoomStudentRelationDao;
 import com.keao.edu.user.dto.ExamRoomDto;
 import com.keao.edu.user.dto.ExamRoomStatisticsDto;
-import com.keao.edu.user.enums.ExamModeEnum;
+import com.keao.edu.user.api.enums.ExamModeEnum;
 import com.keao.edu.user.page.ExamRoomQueryInfo;
 import com.keao.edu.user.service.ExamRoomService;
 import com.keao.edu.user.service.OrganizationService;
-import com.keao.edu.user.service.StudentService;
 import com.keao.edu.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -10,13 +10,12 @@ import com.keao.edu.user.dao.ExaminationBasicDao;
 import com.keao.edu.user.dto.ExaminationBasicDto;
 import com.keao.edu.user.entity.ExamOrganizationRelation;
 import com.keao.edu.user.entity.ExaminationBasic;
-import com.keao.edu.user.enums.ExamModeEnum;
+import com.keao.edu.user.api.enums.ExamModeEnum;
 import com.keao.edu.user.enums.ExamStatusEnum;
 import com.keao.edu.user.page.ExaminationQueryInfo;
 import com.keao.edu.user.service.ExaminationBasicService;
 import com.keao.edu.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

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

@@ -1,6 +1,5 @@
 package com.keao.edu.user.service.impl;
 
-import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.exception.BizException;
@@ -13,9 +12,7 @@ import com.keao.edu.user.dao.SysUserDao;
 import com.keao.edu.user.dao.TenantInfoDao;
 import com.keao.edu.user.entity.Organization;
 import com.keao.edu.user.entity.TenantInfo;
-import com.keao.edu.user.enums.YesOrNoEnum;
 import com.keao.edu.user.service.TenantInfoService;
-import com.netflix.discovery.converters.Auto;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;

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

@@ -9,7 +9,7 @@
 	<resultMap type="com.keao.edu.user.api.entity.ExamRoom" id="ExamRoom">
 		<result column="id_" property="id" />
 		<result column="examination_basic_id_" property="examinationBasicId"/>
-		<result column="exam_mode_" property="examMode" />
+		<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="main_teacher_user_id_" property="mainTeacherUserId" />
@@ -40,7 +40,8 @@
 		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_,
 		exam_room_student_num_,create_time_,update_time_,tenant_id_)
-		VALUES(#{id},#{examinationBasicId},#{examMode},#{examLocationId},#{subjectIdList},#{mainTeacherUserId},#{assistantTeacherUserIdList},
+		VALUES(#{id},#{examinationBasicId},#{examMode,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{examLocationId},#{subjectIdList},
+		#{mainTeacherUserId},#{assistantTeacherUserIdList},
 		#{examStartTime},#{examEndTime},#{delFlag},#{organId},#{examPlanPushFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 		#{examRoomStudentNum},NOW(),NOW(),#{tenantId})
 	</insert>
@@ -68,7 +69,7 @@
 				tenant_id_ = #{tenantId},
 			</if>
 			<if test="examMode != null">
-				exam_mode_ = #{examMode},
+				exam_mode_ = #{examMode,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 			</if>
 			<if test="examLocationId != null">
 				exam_location_id_ = #{examLocationId},
@@ -114,7 +115,7 @@
 				tenant_id_ = #{tenantId},
 			</if>
 			<if test="examMode != null">
-				exam_mode_ = #{examMode},
+				exam_mode_ = #{examMode,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 			</if>
 			<if test="examLocationId != null">
 				exam_location_id_ = #{examLocationId},