Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

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

edu-common/src/main/java/com/keao/edu/common/tenant/TenantInterceptor.java

@@ -31,6 +31,7 @@ public class TenantInterceptor extends HandlerInterceptorAdapter {
 	@Override
 	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
 		TenantContextHolder.clearTenantId();
+		OrganContextHolder.clearOrganId();
 	}
 
 }

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

@@ -4,12 +4,10 @@ package com.keao.edu.user.controller;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.common.page.QueryInfo;
 import com.keao.edu.common.tenant.OrganContextHolder;
 import com.keao.edu.common.tenant.TenantContextHolder;
 import com.keao.edu.user.entity.Teacher;
 import com.keao.edu.user.page.TeacherQueryInfo;
-import com.keao.edu.user.service.OrganizationService;
 import com.keao.edu.user.service.TeacherService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,8 +25,6 @@ public class TeacherController extends BaseController {
 
 	@Autowired
 	private TeacherService teacherService;
-	@Autowired
-	private OrganizationService organizationService;
 
 	@ApiOperation(value = "教师列表")
 	@GetMapping(value = "list")

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

@@ -1,7 +1,6 @@
 package com.keao.edu.user.entity;
 
 import com.keao.edu.user.enums.SettlementTypeEnum;
-import com.keao.edu.user.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -48,10 +47,10 @@ public class ExamOrganizationRelation {
 	private String url;
 
 	@ApiModelProperty(value = "是否已发送链接")
-	private YesOrNoEnum sendUrlFlag;
+	private Integer sendUrlFlag;
 
 	@ApiModelProperty(value = "是否允许排考")
-	private YesOrNoEnum isAllowArrangeExam;
+	private Integer isAllowArrangeExam;
 
 	private java.util.Date createTime;
 
@@ -155,19 +154,19 @@ public class ExamOrganizationRelation {
 		return this.url;
 	}
 
-	public YesOrNoEnum getSendUrlFlag() {
+	public Integer getSendUrlFlag() {
 		return sendUrlFlag;
 	}
 
-	public void setSendUrlFlag(YesOrNoEnum sendUrlFlag) {
+	public void setSendUrlFlag(Integer sendUrlFlag) {
 		this.sendUrlFlag = sendUrlFlag;
 	}
 
-	public YesOrNoEnum getIsAllowArrangeExam() {
+	public Integer getIsAllowArrangeExam() {
 		return isAllowArrangeExam;
 	}
 
-	public void setIsAllowArrangeExam(YesOrNoEnum isAllowArrangeExam) {
+	public void setIsAllowArrangeExam(Integer isAllowArrangeExam) {
 		this.isAllowArrangeExam = isAllowArrangeExam;
 	}
 

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

@@ -42,7 +42,7 @@ public class Organization {
 	private String parentOrganIdTag;
 
 	@ApiModelProperty(value = "是否允许排考")
-	private YesOrNoEnum isAllowArrangeExam;
+	private Integer isAllowArrangeExam;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -73,14 +73,6 @@ public class Organization {
 		this.userId = userId;
 	}
 
-	public YesOrNoEnum getIsAllowArrangeExam() {
-		return isAllowArrangeExam;
-	}
-
-	public void setIsAllowArrangeExam(YesOrNoEnum isAllowArrangeExam) {
-		this.isAllowArrangeExam = isAllowArrangeExam;
-	}
-
 	public SysUser getSysUser() {
 		return sysUser;
 	}
@@ -89,6 +81,14 @@ public class Organization {
 		this.sysUser = sysUser;
 	}
 
+	public Integer getIsAllowArrangeExam() {
+		return isAllowArrangeExam;
+	}
+
+	public void setIsAllowArrangeExam(Integer isAllowArrangeExam) {
+		this.isAllowArrangeExam = isAllowArrangeExam;
+	}
+
 	public Integer getLevel() {
 		return level;
 	}

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

@@ -149,7 +149,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			if(Objects.isNull(organization)){
 				throw new BizException("合作单位信息错误");
 			}
-			og.setSendUrlFlag(YesOrNoEnum.NO);
+			og.setSendUrlFlag(0);
 			og.setIsAllowArrangeExam(organization.getIsAllowArrangeExam());
 			og.setSettlementType(organization.getSettlementType());
 			og.setShareProfitAmount(organization.getShareProfitAmount());
@@ -207,7 +207,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			}
 			needUpdate.add(examOrgan);
 
-			examOrgan.setSendUrlFlag(YesOrNoEnum.YES);
+			examOrgan.setSendUrlFlag(1);
 
 			SysUser student = sysUserFeignService.queryUserById(examOrgan.getOrganId());
 			Map<Integer, String> userPhoneMap = new HashMap<>();

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

@@ -27,7 +27,6 @@ import org.springframework.util.CollectionUtils;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -58,8 +57,8 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
 		Organization currentOrganization = organDao.get(queryUserInfo.getId());
 		//获取父级的organ
-		if(organ.getIsAllowArrangeExam() == YesOrNoEnum.YES){
-			if(currentOrganization.getIsAllowArrangeExam() == YesOrNoEnum.NO){
+		if(organ.getIsAllowArrangeExam() == 1){
+			if(currentOrganization.getIsAllowArrangeExam() == 0){
 				throw new BizException("无权创建可排考的合作单位");
 			}
 		}

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

@@ -17,7 +17,6 @@ import com.keao.edu.user.dto.TenantInfoDto;
 import com.keao.edu.user.entity.Employee;
 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.keao.edu.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -27,7 +26,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
 public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo> implements TenantInfoService {
@@ -84,7 +82,7 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 		organ.setName(sysUser.getRealName());
 		organ.setContactName(tenantInfo.getContactName());
 		organ.setContactPhone(tenantInfo.getContactPhone());
-		organ.setIsAllowArrangeExam(YesOrNoEnum.YES);
+		organ.setIsAllowArrangeExam(1);
 		organizationDao.insert(organ);
 
 		Employee employee = new Employee();

edu-user/edu-user-server/src/main/resources/application.yml

@@ -23,6 +23,13 @@ eureka:
 spring:
   application:
     name: user-server
+
+  servlet:
+    multipart:
+      # 最大支持文件大小
+      max-file-size: 50MB
+      # 最大支持请求大小
+      max-request-size: 50MB
     
   datasource:
     name: test

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

@@ -18,8 +18,8 @@
 		<result column="total_payment_amount_" property="totalPaymentAmount"/>
 		<result column="total_trans_amount_" property="totalTransAmount" />
 		<result column="url_" property="url" />
-		<result column="send_url_flag_" property="sendUrlFlag" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler" />
-		<result column="is_allow_arrange_exam_" property="isAllowArrangeExam" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler" />
+		<result column="send_url_flag_" property="sendUrlFlag" />
+		<result column="is_allow_arrange_exam_" property="isAllowArrangeExam" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
@@ -47,8 +47,7 @@
 		create_time_,update_time_,tenant_id_)
 		VALUES(#{examinationBasicId},#{organId},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{shareProfitAmount},
 		#{selfRegistrationStudentNum},#{selfPaymentAmount},#{totalRegistrationStudentNum},#{totalPaymentAmount},
-		#{url},#{sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
-		#{isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},totalTransAmount,
+		#{url},#{sendUrlFlag},#{isAllowArrangeExam},#{totalTransAmount},
 		NOW(),NOW(),#{tenantId})
 	</insert>
 
@@ -66,8 +65,8 @@
 			#{examOrganizationRelation.selfPaymentAmount},
 			#{examOrganizationRelation.totalRegistrationStudentNum},
 			#{examOrganizationRelation.totalPaymentAmount},#{examOrganizationRelation.url},
-			#{examOrganizationRelation.sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
-			#{examOrganizationRelation.isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+			#{examOrganizationRelation.sendUrlFlag},
+			#{examOrganizationRelation.isAllowArrangeExam},
 			#{examOrganizationRelation.totalTransAmount},
 			NOW(),NOW(),#{examOrganizationRelation.tenantId})
 		</foreach>
@@ -81,10 +80,10 @@
 				examination_basic_id_ = #{examinationBasicId},
 			</if>
 			<if test="sendUrlFlag != null">
-				send_url_flag_ = #{sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+				send_url_flag_ = #{sendUrlFlag},
 			</if>
 			<if test="isAllowArrangeExam != null">
-				is_allow_arrange_exam_ = #{isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+				is_allow_arrange_exam_ = #{isAllowArrangeExam},
 			</if>
 			<if test="url != null">
 				url_ = #{url},
@@ -128,10 +127,10 @@
 					examination_basic_id_ = #{eo.examinationBasicId},
 				</if>
 				<if test="eo.sendUrlFlag != null">
-					send_url_flag_ = #{eo.sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+					send_url_flag_ = #{eo.sendUrlFlag},
 				</if>
 				<if test="eo.isAllowArrangeExam != null">
-					is_allow_arrange_exam_ = #{eo.isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+					is_allow_arrange_exam_ = #{eo.isAllowArrangeExam},
 				</if>
 				<if test="eo.url != null">
 					url_ = #{eo.url},

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

@@ -6,482 +6,433 @@
 -->
 <mapper namespace="com.keao.edu.user.dao.ExamRegistrationDao">
 
-    <resultMap type="com.keao.edu.user.entity.ExamRegistration" id="ExamRegistration">
-        <id column="id_" property="id"/>
-        <result column="examination_basic_id_" property="examinationBasicId"/>
-        <result column="student_id_" property="studentId"/>
-        <result column="organ_id_" property="organId"/>
-        <result column="subject_id_" property="subjectId"/>
-        <result column="level_" property="level"/>
-        <result column="level_fee_" property="levelFee"/>
-        <result column="song_json_" property="songJson"/>
-        <result column="last_exam_level_" property="lastExamLevel"/>
-        <result column="last_exam_certificate_url_" property="lastExamCertificateUrl"/>
-        <result column="exam_music_theory_level_" property="examMusicTheoryLevel"/>
-        <result column="theory_level_fee_" property="theoryLevelFee"/>
-        <result column="last_music_theory_level_" property="lastMusicTheoryLevel"/>
-        <result column="last_music_theory_certificate_url_" property="lastMusicTheoryCertificateUrl"/>
-        <result column="adviser_name_" property="adviserName"/>
-        <result column="adviser_phone_" property="adviserPhone"/>
-        <result column="card_no_" property="cardNo"/>
-        <result column="status_" property="status"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-        <result column="tenant_id_" property="tenantId"/>
-        <result column="memo_" property="memo"/>
-        <association property="sysUser" columnPrefix="sys_user_" resultMap="com.keao.edu.user.dao.StudentDao.Student"/>
-        <association property="subject" columnPrefix="subject_" resultMap="com.keao.edu.user.dao.SubjectDao.Subject"/>
-        <association property="examinationBasic" columnPrefix="examination_basic_"
-                     resultMap="com.keao.edu.user.dao.ExaminationBasicDao.ExaminationBasic"/>
-    </resultMap>
+	<resultMap type="com.keao.edu.user.entity.ExamRegistration" id="ExamRegistration">
+		<id column="id_" property="id" />
+		<result column="examination_basic_id_" property="examinationBasicId" />
+		<result column="student_id_" property="studentId" />
+		<result column="organ_id_" property="organId" />
+		<result column="subject_id_" property="subjectId" />
+		<result column="level_" property="level" />
+		<result column="level_fee_" property="levelFee" />
+		<result column="song_json_" property="songJson" />
+		<result column="last_exam_level_" property="lastExamLevel" />
+		<result column="last_exam_certificate_url_" property="lastExamCertificateUrl" />
+		<result column="exam_music_theory_level_" property="examMusicTheoryLevel" />
+		<result column="theory_level_fee_" property="theoryLevelFee" />
+		<result column="last_music_theory_level_" property="lastMusicTheoryLevel" />
+		<result column="last_music_theory_certificate_url_" property="lastMusicTheoryCertificateUrl" />
+		<result column="adviser_name_" property="adviserName" />
+		<result column="adviser_phone_" property="adviserPhone" />
+		<result column="card_no_" property="cardNo" />
+		<result column="status_" property="status" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="tenant_id_" property="tenantId" />
+		<result column="memo_" property="memo" />
+		<association property="sysUser" columnPrefix="sys_user_" resultMap="com.keao.edu.user.dao.StudentDao.Student"/>
+		<association property="subject" columnPrefix="subject_" resultMap="com.keao.edu.user.dao.SubjectDao.Subject"/>
+		<association property="examinationBasic" columnPrefix="examination_basic_" resultMap="com.keao.edu.user.dao.ExaminationBasicDao.ExaminationBasic"/>
+	</resultMap>
 
-    <resultMap id="ExamRegistrationRoomDto" type="com.keao.edu.user.dto.ExamRegistrationRoomDto"
-               extends="ExamRegistration">
-        <result column="exam_room_id_" property="examRoomId"/>
-        <result column="exam_start_time_" property="examStartTime"/>
-        <result column="exam_end_time_" property="examEndTime"/>
-    </resultMap>
+	<resultMap id="ExamRegistrationRoomDto" type="com.keao.edu.user.dto.ExamRegistrationRoomDto" extends="ExamRegistration">
+		<result column="exam_room_id_" property="examRoomId"/>
+		<result column="exam_start_time_" property="examStartTime"/>
+		<result column="exam_end_time_" property="examEndTime"/>
+	</resultMap>
 
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="ExamRegistration">
-        SELECT *
-        FROM exam_registration
-        WHERE id_ = #{id}
-    </select>
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="ExamRegistration" >
+		SELECT * FROM exam_registration WHERE id_ = #{id}
+	</select>
 
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="ExamRegistration">
-        SELECT *
-        FROM exam_registration
-        ORDER BY id_
-    </select>
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="ExamRegistration">
+		SELECT * FROM exam_registration ORDER BY id_
+	</select>
 
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.keao.edu.user.entity.ExamRegistration" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
-        INSERT INTO exam_registration (examination_basic_id_, student_id_, organ_id_, subject_id_, level_, level_fee_,
-                                       song_json_, last_exam_level_, last_exam_certificate_url_,
-                                       exam_music_theory_level_, theory_level_fee_,
-                                       last_music_theory_level_, last_music_theory_certificate_url_, adviser_name_,
-                                       adviser_phone_, card_no_, status_,
-                                       create_time_, update_time_, tenant_id_, memo_)
-        VALUES (#{examinationBasicId}, #{studentId}, #{organId}, #{subjectId}, #{level}, #{levelFee}, #{songJson},
-                #{lastExamLevel}, #{lastExamCertificateUrl}, #{examMusicTheoryLevel}, #{theoryLevelFee},
-                #{lastMusicTheoryLevel},
-                #{lastMusicTheoryCertificateUrl}, #{adviserName}, #{adviserPhone}, #{cardNo}, #{status}, #{createTime},
-                #{updateTime}, #{tenantId}, #{memo})
-    </insert>
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamRegistration" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO  exam_registration (examination_basic_id_, student_id_, organ_id_,subject_id_, level_, level_fee_,
+		song_json_, last_exam_level_, last_exam_certificate_url_,exam_music_theory_level_, theory_level_fee_,
+		last_music_theory_level_,last_music_theory_certificate_url_, adviser_name_,adviser_phone_, card_no_, status_,
+		create_time_, update_time_, tenant_id_,memo_)
+		VALUES (#{examinationBasicId}, #{studentId}, #{organId}, #{subjectId}, #{level}, #{levelFee}, #{songJson},
+		#{lastExamLevel}, #{lastExamCertificateUrl}, #{examMusicTheoryLevel}, #{theoryLevelFee}, #{lastMusicTheoryLevel},
+		#{lastMusicTheoryCertificateUrl}, #{adviserName}, #{adviserPhone}, #{cardNo}, #{status},#{createTime},
+		#{updateTime}, #{tenantId}, #{memo})
+	</insert>
 
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.keao.edu.user.entity.ExamRegistration">
-        UPDATE exam_registration
-        <set>
-            <if test="examinationBasicId != null">
-                examination_basic_id_ = #{examinationBasicId},
-            </if>
-            <if test="studentId != null != null">
-                student_id_ = #{studentId},
-            </if>
-            <if test="organId != null">
-                organ_id_ = #{organId},
-            </if>
-            <if test="subjectId != null">
-                subject_id_ = #{subjectId},
-            </if>
-            <if test="level != null">
-                level_ = #{level},
-            </if>
-            <if test="levelFee != null">
-                level_fee_ = #{levelFee},
-            </if>
-            <if test="songJson != null">
-                song_json_ = #{songJson},
-            </if>
-            <if test="lastExamLevel != null">
-                last_exam_level_ = #{lastExamLevel},
-            </if>
-            <if test="lastExamCertificateUrl != null">
-                last_exam_certificate_url_ = #{lastExamCertificateUrl},
-            </if>
-            <if test="examMusicTheoryLevel!= null">
-                exam_music_theory_level_ = #{examMusicTheoryLevel},
-            </if>
-            <if test="theoryLevelFee!= null">
-                theory_level_fee_ = #{theoryLevelFee},
-            </if>
-            <if test="lastMusicTheoryLevel != null">
-                last_music_theory_level_ = #{lastMusicTheoryLevel},
-            </if>
-            <if test="lastMusicTheoryCertificateUrl != null">
-                last_music_theory_certificate_url_ = #{lastMusicTheoryCertificateUrl},
-            </if>
-            <if test="adviserName != null">
-                adviser_name_ = #{adviserName},
-            </if>
-            <if test="adviserPhone != null">
-                adviser_phone_ = #{adviserPhone},
-            </if>
-            <if test="cardNo!=null">
-                card_no_ =#{cardNo},
-            </if>
-            <if test="status!=null">
-                status_ = #{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="tenantId != null">
-                tenant_id_ = #{tenantId},
-            </if>
-            <if test="createTime != null">
-                create_time_ = #{createTime},
-            </if>
-            <if test="memo!=null">
-                memo_ = #{memo},
-            </if>
-            update_time_ = NOW()
-        </set>
-        WHERE id_ = #{id}
-    </update>
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.keao.edu.user.entity.ExamRegistration">
+		UPDATE exam_registration
+		<set>
+			<if test="examinationBasicId != null">
+				examination_basic_id_ = #{examinationBasicId},
+			</if>
+			<if test="studentId != null != null">
+				student_id_ = #{studentId},
+			</if>
+			<if test="organId != null">
+				organ_id_ = #{organId},
+			</if>
+			<if test="subjectId != null">
+				subject_id_ = #{subjectId},
+			</if>
+			<if test="level != null">
+				level_ = #{level},
+			</if>
+			<if test="levelFee != null">
+				level_fee_ = #{levelFee},
+			</if>
+			<if test="songJson != null">
+				song_json_ = #{songJson},
+			</if>
+			<if test="lastExamLevel != null">
+				last_exam_level_ = #{lastExamLevel},
+			</if>
+			<if test="lastExamCertificateUrl != null">
+				last_exam_certificate_url_ = #{lastExamCertificateUrl},
+			</if>
+			<if test="examMusicTheoryLevel!= null">
+				exam_music_theory_level_ = #{examMusicTheoryLevel},
+			</if>
+			<if test="theoryLevelFee!= null">
+				theory_level_fee_ = #{theoryLevelFee},
+			</if>
+			<if test="lastMusicTheoryLevel != null">
+				last_music_theory_level_ = #{lastMusicTheoryLevel},
+			</if>
+			<if test="lastMusicTheoryCertificateUrl != null">
+				last_music_theory_certificate_url_ = #{lastMusicTheoryCertificateUrl},
+			</if>
+			<if test="adviserName != null">
+				adviser_name_ = #{adviserName},
+			</if>
+			<if test="adviserPhone != null">
+				adviser_phone_ = #{adviserPhone},
+			</if>
+			<if test="cardNo!=null">
+				card_no_ =#{cardNo},
+			</if>
+			<if test="status!=null">
+				status_ = #{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+			</if>
+			<if test="tenantId != null">
+				tenant_id_ = #{tenantId},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+			<if test="memo!=null">
+				memo_ = #{memo},
+			</if>
+			update_time_ = NOW()
+		</set>
+		WHERE id_ = #{id}
+	</update>
 
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-        DELETE
-        FROM exam_registration
-        WHERE id_ = #{id}
-    </delete>
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM exam_registration WHERE id_ = #{id}
+	</delete>
 
-    <sql id="queryCondition">
-        <where>
-            <if test="organIds!=null">
-                AND er.organ_id_ IN
-                <foreach collection="organIds" item="organId" separator="," open="(" close=")">
-                    #{organId}
-                </foreach>
-            </if>
-            <if test="examId!=null">
-                AND er.examination_basic_id_ = #{examId}
-            </if>
-            <if test="organId != null">
-                AND er.organ_id_ = #{organId}
-            </if>
-            <if test="subjectId!=null">
-                AND er.subject_id_ = #{subjectId}
-            </if>
-            <if test="level!=null">
-                AND er.level_ = #{level}
-            </if>
-            <if test="status!=null">
-                AND er.status_ = #{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
-            </if>
-        </where>
-    </sql>
+	<sql id="queryCondition">
+		<where>
+			er.status_ != 'PAY_WAIT' AND er.status_ != 'AUDIT_WAIT'
+			<if test="organIds!=null">
+				AND er.organ_id_ IN
+				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+					#{organId}
+				</foreach>
+			</if>
+			<if test="examId!=null">
+				AND er.examination_basic_id_ = #{examId}
+			</if>
+			<if test="organId != null">
+				AND er.organ_id_ = #{organId}
+			</if>
+			<if test="subjectId!=null">
+				AND er.subject_id_ = #{subjectId}
+			</if>
+			<if test="level!=null">
+				AND er.level_ = #{level}
+			</if>
+			<if test="status!=null">
+				AND er.status_ = #{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
+			</if>
+		</where>
+	</sql>
 
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="ExamRegistration" parameterType="map">
-        SELECT
-        er.id_,
-        er.examination_basic_id_,
-        er.exam_music_theory_level_,
-        er.card_no_,
-        er.student_id_,
-        er.memo_,
-        su.real_name_ sys_user_real_name_,
-        er.last_exam_certificate_url_,
-        er.last_music_theory_certificate_url_,
-        er.level_fee_,
-        er.theory_level_fee_,
-        er.organ_id_,
-        er.subject_id_,
-        er.level_,
-        erp.trans_amount_,
-        er.status_,
-        er.create_time_
-        FROM
-        exam_registration er
-        LEFT JOIN sys_user su ON er.student_id_ = su.id_
-        LEFT JOIN exam_registration_payment erp ON er.id_ = erp.exam_registration_id_
-        <include refid="queryCondition"/>
-        ORDER BY er.id_
-        <include refid="global.limit"/>
-    </select>
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="ExamRegistration" parameterType="map">
+		SELECT
+			er.id_,
+			er.examination_basic_id_,
+			er.exam_music_theory_level_,
+			er.card_no_,
+			er.student_id_,
+			er.memo_,
+			su.real_name_ sys_user_real_name_,
+			er.last_exam_certificate_url_,
+			er.last_music_theory_certificate_url_,
+			er.level_fee_,
+			er.theory_level_fee_,
+			er.organ_id_,
+			er.subject_id_,
+			er.level_,
+			erp.trans_amount_,
+			er.status_,
+			er.create_time_
+		FROM
+			exam_registration er
+			LEFT JOIN sys_user su ON er.student_id_ = su.id_
+			LEFT JOIN exam_registration_payment erp ON er.id_ = erp.exam_registration_id_
+		<include refid="queryCondition"/>
+		ORDER BY er.id_
+		<include refid="global.limit"/>
+	</select>
 
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-        SELECT COUNT(*) FROM exam_registration er
-        <include refid="queryCondition"/>
-    </select>
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM exam_registration er
+		<include refid="queryCondition"/>
+	</select>
 
-    <sql id="queryExamRegistCondition">
-        <where>
-            <if test="organIds!=null">
-                AND er.organ_id_ IN
-                <foreach collection="organIds" item="organId" separator="," open="(" close=")">
-                    #{organId}
-                </foreach>
-            </if>
-            <if test="examId!=null">
-                AND er.examination_basic_id_ = #{examId}
-            </if>
-            <if test="organId!=null">
-                AND er.organ_id_ = #{organId}
-            </if>
-            <if test="subjectId!=null">
-                AND er.subject_id_ = #{subjectId}
-            </if>
-            <if test="level!=null">
-                AND er.level_ = #{level}
-            </if>
-            <if test="status!=null">
-                AND er.status_ = #{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
-            </if>
-            <if test="inRoom!=null and inRoom=0">
-                AND ersr.exam_room_id_ IS NULL
-            </if>
-            <if test="inRoom!=null and inRoom=1">
-                AND ersr.exam_room_id_ IS NOT NULL
-            </if>
-        </where>
-    </sql>
+	<sql id="queryExamRegistCondition">
+		<where>
+			<if test="organIds!=null">
+				AND er.organ_id_ IN
+				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+					#{organId}
+				</foreach>
+			</if>
+			<if test="examId!=null">
+				AND er.examination_basic_id_ = #{examId}
+			</if>
+			<if test="organId!=null">
+				AND er.organ_id_ = #{organId}
+			</if>
+			<if test="subjectId!=null">
+				AND er.subject_id_ = #{subjectId}
+			</if>
+			<if test="level!=null">
+				AND er.level_ = #{level}
+			</if>
+			<if test="status!=null">
+				AND er.status_ = #{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
+			</if>
+			<if test="inRoom!=null and inRoom=0">
+				AND ersr.exam_room_id_ IS NULL
+			</if>
+			<if test="inRoom!=null and inRoom=1">
+				AND ersr.exam_room_id_ IS NOT NULL
+			</if>
+		</where>
+	</sql>
 
-    <select id="queryExamRegist" resultMap="ExamRegistrationRoomDto" parameterType="map">
-        SELECT
-        er.id_,
-        er.examination_basic_id_,
-        er.exam_music_theory_level_,
-        er.card_no_,
-        er.student_id_,
-        er.memo_,
-        su.real_name_ sys_user_real_name_,
-        su.phone_ sys_user_phone_,
-        er.last_exam_certificate_url_,
-        er.last_music_theory_certificate_url_,
-        er.level_fee_,
-        er.theory_level_fee_,
-        er.song_json_,
-        er.organ_id_,
-        er.subject_id_,
-        er.level_,
-        erp.trans_amount_,
-        er.status_,
-        er.create_time_,
-        ersr.exam_room_id_,
-        ero.exam_start_time_,
-        ero.exam_end_time_
-        FROM
-        exam_registration er
-        LEFT JOIN sys_user su ON er.student_id_ = su.id_
-        LEFT JOIN exam_registration_payment erp ON er.id_ = erp.exam_registration_id_
-        LEFT JOIN exam_room_student_relation ersr ON ersr.exam_registration_id_ = er.id_
-        LEFT JOIN exam_room ero ON ero.id_ = ersr.exam_room_id_
-        <include refid="queryCondition"/>
-        ORDER BY er.id_ DESC
-        <include refid="global.limit"/>
-    </select>
+	<select id="queryExamRegist" resultMap="ExamRegistrationRoomDto" parameterType="map">
+		SELECT
+			er.id_,
+			er.examination_basic_id_,
+			er.exam_music_theory_level_,
+			er.card_no_,
+			er.student_id_,
+			er.memo_,
+			su.real_name_ sys_user_real_name_,
+			su.phone_ sys_user_phone_,
+			er.last_exam_certificate_url_,
+			er.last_music_theory_certificate_url_,
+			er.level_fee_,
+			er.theory_level_fee_,
+			er.song_json_,
+			er.organ_id_,
+			er.subject_id_,
+			er.level_,
+			erp.trans_amount_,
+			er.status_,
+			er.create_time_,
+			ersr.exam_room_id_,
+			ero.exam_start_time_,
+			ero.exam_end_time_
+		FROM
+			exam_registration er
+			LEFT JOIN sys_user su ON er.student_id_ = su.id_
+			LEFT JOIN exam_registration_payment erp ON er.id_ = erp.exam_registration_id_
+			LEFT JOIN exam_room_student_relation ersr ON ersr.exam_registration_id_ = er.id_
+			LEFT JOIN exam_room ero ON ero.id_ = ersr.exam_room_id_
+		<include refid="queryCondition"/>
+		ORDER BY er.id_ DESC
+		<include refid="global.limit"/>
+	</select>
 
-    <select id="countExamRegist" resultType="int">
-        SELECT COUNT(*) FROM exam_registration er
-        LEFT JOIN exam_room_student_relation ersr ON ersr.exam_registration_id_ = er.id_
-        <include refid="queryCondition"/>
-    </select>
+	<select id="countExamRegist" resultType="int">
+		SELECT COUNT(*) FROM exam_registration er
+		LEFT JOIN exam_room_student_relation ersr ON ersr.exam_registration_id_ = er.id_
+		<include refid="queryCondition"/>
+	</select>
 
     <select id="countWithoutExamRoomStudentNum" resultType="int">
-        SELECT
-        COUNT(ersr.id_)
-        FROM
-        exam_registration er
-        LEFT JOIN exam_room_student_relation ersr ON ersr.student_id_ = er.student_id_
-        WHERE 1=1
-        <if test="organIds!=null">
-            AND er.organ_id_ IN
-            <foreach collection="organIds" item="organI" separator="," open="(" close=")">
-                #{organI}
-            </foreach>
-        </if>
-        AND er.examination_basic_id_ = #{examId}
-        AND ersr.id_ IS NULL
-    </select>
+		SELECT
+			COUNT(ersr.id_)
+		FROM
+			exam_registration er
+		LEFT JOIN exam_room_student_relation ersr ON ersr.student_id_ = er.student_id_
+		WHERE 1=1
+		<if test="organIds!=null">
+			AND er.organ_id_ IN
+			<foreach collection="organIds" item="organI" separator="," open="(" close=")">
+				#{organI}
+			</foreach>
+		</if>
+		AND er.examination_basic_id_ = #{examId}
+		AND ersr.id_ IS NULL
+	</select>
 
-    <select id="countInExamRoomStudentNum" resultType="int">
-        SELECT
-        COUNT(ersr.id_)
-        FROM
-        exam_room_student_relation ersr
-        LEFT JOIN exam_registration er ON ersr.exam_registration_id_ = er.id_
-        WHERE 1=1
-        <if test="organIds!=null">
-            AND er.organ_id_ IN
-            <foreach collection="organIds" item="organI" separator="," open="(" close=")">
-                #{organI}
-            </foreach>
-        </if>
-        AND ersr.examination_basic_id_ = #{examId}
-    </select>
+	<select id="countInExamRoomStudentNum" resultType="int">
+		SELECT
+			COUNT(ersr.id_)
+		FROM
+			exam_room_student_relation ersr
+		LEFT JOIN exam_registration er ON ersr.exam_registration_id_ = er.id_
+		WHERE 1=1
+		<if test="organIds!=null">
+			AND er.organ_id_ IN
+			<foreach collection="organIds" item="organI" separator="," open="(" close=")">
+				#{organI}
+			</foreach>
+		</if>
+		AND ersr.examination_basic_id_ = #{examId}
+	</select>
 
-    <resultMap id="ExamRegistrationStatisticsDto" type="com.keao.edu.user.dto.ExamRegistrationStatisticsDto">
-        <result property="totalRegistrationStudentNum" column="totalRegistrationStudentNum"/>
-        <result property="childOrganRegistrationStudentNum" column="childOrganRegistrationStudentNum"/>
-        <result property="waitAuditStudentNum" column="waitAuditStudentNum"/>
-        <result property="refundedStudentNum" column="refundedStudentNum"/>
-    </resultMap>
+	<resultMap id="ExamRegistrationStatisticsDto" type="com.keao.edu.user.dto.ExamRegistrationStatisticsDto">
+		<result property="totalRegistrationStudentNum" column="totalRegistrationStudentNum"/>
+		<result property="childOrganRegistrationStudentNum" column="childOrganRegistrationStudentNum"/>
+		<result property="waitAuditStudentNum" column="waitAuditStudentNum"/>
+		<result property="refundedStudentNum" column="refundedStudentNum"/>
+	</resultMap>
 
     <select id="getExamRegistrationStaticsInfo" resultMap="ExamRegistrationStatisticsDto">
-        SELECT
-        SUM( CASE WHEN er.organ_id_ = #{selfOrganId} THEN 1 ELSE 0 END ) totalRegistrationStudentNum,
-        SUM( CASE WHEN er.organ_id_ != #{selfOrganId} THEN 1 ELSE 0 END ) childOrganRegistrationStudentNum,
-        SUM( CASE WHEN er.status_ = 'AUDIT_WAIT' THEN 1 ELSE 0 END ) waitAuditStudentNum,
-        SUM( CASE WHEN er.status_ = 'REFUNDED' THEN 1 ELSE 0 END ) refundedStudentNum
-        FROM
-        exam_registration er
-        WHERE
-        er.examination_basic_id_ = #{examId}
-        <if test="organIds!=null">
-            AND er.organ_id_ IN
-            <foreach collection="organIds" item="organId" separator="," open="(" close=")">
-                #{organId}
-            </foreach>
-        </if>
+		SELECT
+			SUM( CASE WHEN er.organ_id_ = #{selfOrganId} THEN 1 ELSE 0 END ) totalRegistrationStudentNum,
+			SUM( CASE WHEN er.organ_id_ != #{selfOrganId} THEN 1 ELSE 0 END ) childOrganRegistrationStudentNum,
+			SUM( CASE WHEN er.status_ = 'AUDIT_WAIT' THEN 1 ELSE 0 END ) waitAuditStudentNum,
+			SUM( CASE WHEN er.status_ = 'REFUNDED' THEN 1 ELSE 0 END ) refundedStudentNum
+		FROM
+			exam_registration er
+		WHERE
+			er.examination_basic_id_ = #{examId}
+			<if test="organIds!=null">
+				AND er.organ_id_ IN
+				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+					#{organId}
+				</foreach>
+			</if>
     </select>
 
-    <select id="countTotalRegistrationStudentNumWithExam" resultType="int">
-        SELECT
-        COUNT(er.id_)
-        FROM
-        exam_registration er
-        WHERE 1=1
-        <if test="organIds!=null">
-            AND er.organ_id_ IN
-            <foreach collection="organIds" item="organI" separator="," open="(" close=")">
-                #{organI}
-            </foreach>
-        </if>
-        AND er.examination_basic_id_ = #{examId}
-        AND er.status_ != ''
-    </select>
+	<select id="countTotalRegistrationStudentNumWithExam" resultType="int">
+		SELECT
+			COUNT(er.id_)
+		FROM
+		exam_registration er
+		WHERE 1=1
+		<if test="organIds!=null">
+			AND er.organ_id_ IN
+			<foreach collection="organIds" item="organI" separator="," open="(" close=")">
+				#{organI}
+			</foreach>
+		</if>
+		AND er.examination_basic_id_ = #{examId}
+		AND er.status_ != ''
+	</select>
 
     <select id="getWithExamAndStudents" resultMap="ExamRegistration">
-        SELECT * FROM exam_registration WHERE examination_basic_id_=#{examId} AND student_id_ IN
-        <foreach collection="studentIds" item="studentId" separator="," open="(" close=")">
-            #{studentId}
-        </foreach>
-    </select>
+		SELECT * FROM exam_registration WHERE examination_basic_id_=#{examId} AND student_id_ IN
+		<foreach collection="studentIds" item="studentId" separator="," open="(" close=")">
+			#{studentId}
+		</foreach>
+	</select>
 
-    <select id="getRegists" resultMap="ExamRegistration">
-        SELECT * FROM exam_registration WHERE id_ IN
-        <foreach collection="registIds" item="registId" separator="," open="(" close=")">
-            #{registId}
-        </foreach>
-    </select>
+	<select id="getRegists" resultMap="ExamRegistration">
+		SELECT * FROM exam_registration WHERE id_ IN
+		<foreach collection="registIds" item="registId" separator="," open="(" close=")">
+			#{registId}
+		</foreach>
+	</select>
 
-    <resultMap id="ExamRegistrationDtoMap" type="com.keao.edu.user.dto.ExamRegistrationDto" extends="ExamRegistration">
-        <result property="studentName" column="studentName"/>
-        <result property="subjectName" column="subjectName"/>
-        <result property="examBaseName" column="examBaseName"/>
-        <result property="examStartTime" column="expect_exam_start_time_"/>
-        <result property="examEndTime" column="expect_exam_end_time_"/>
-        <result property="enrollEndTime" column="enroll_end_time_"/>
-        <result property="enrollStartTime" column="enroll_start_time_"/>
-    </resultMap>
+	<resultMap id="ExamRegistrationDtoMap" type="com.keao.edu.user.dto.ExamRegistrationDto" extends="ExamRegistration">
+		<result property="studentName" column="studentName"/>
+		<result property="subjectName" column="subjectName"/>
+		<result property="examBaseName" column="examBaseName"/>
+		<result property="examStartTime" column="expect_exam_start_time_"/>
+		<result property="examEndTime" column="expect_exam_end_time_"/>
+		<result property="enrollEndTime" column="enroll_end_time_"/>
+		<result property="enrollStartTime" column="enroll_start_time_"/>
+	</resultMap>
     <select id="countStudentList" resultType="java.lang.Integer">
-        SELECT COUNT(er.id_) FROM exam_registration er
-        <include refid="queryStudentListSql"/>
-    </select>
-    <sql id="queryStudentListSql">
-        <where>
-            <if test="studentId != null">
-                er.student_id_ = #{studentId}
-            </if>
-            <if test="examRegistrationId != null">
-                er.id_ = #{examRegistrationId}
-            </if>
-            <if test="tenantId != null and tenantId != 0">
-                er.tenant_id_ = #{tenantId}
-            </if>
-            <if test="status != null and status != ''">
-                er.status_ = #{status}
-            </if>
-        </where>
-    </sql>
-    <select id="queryStudentList" resultMap="ExamRegistrationDtoMap">
-        SELECT
-        er.*,eb.enroll_end_time_,eb.enroll_start_time_,eb.expect_exam_end_time_,eb.expect_exam_start_time_,eb.name_
-        examBaseName
-        FROM exam_registration er
-        LEFT JOIN examination_basic eb ON er.examination_basic_id_ = eb.id_
-        <include refid="queryStudentListSql"/>
-        ORDER BY er.update_time_ DESC
-        <include refid="global.limit"/>
-    </select>
-    <resultMap id="ExamRecordDtoMap" type="com.keao.edu.user.dto.ExamRecordDto" extends="ExamRegistration">
-        <result property="subjectName" column="subjectName"/>
-        <result property="examBaseName" column="examBaseName"/>
-        <result property="examCertificationId" column="examCertificationId"/>
-        <association property="studentExamResult"
-                     resultMap="com.keao.edu.user.dao.StudentExamResultDao.StudentExamResult"/>
-    </resultMap>
-    <select id="queryExamList" resultMap="ExamRecordDtoMap">
-        SELECT er.*, ser.*
-        FROM exam_registration er
-                 LEFT JOIN student_exam_result ser ON er.id_ = ser.exam_registration_id_
-        WHERE ser.id_ IS NOT NULL
-          AND er.student_id_ = #{studentId}
-    </select>
-    <select id="countExamList" resultType="java.lang.Integer">
-        SELECT COUNT(er.id_)
-        FROM exam_registration er
-                 LEFT JOIN student_exam_result ser ON er.id_ = ser.exam_registration_id_
-        WHERE ser.id_ IS NOT NULL
-          AND er.student_id_ = #{studentId}
-    </select>
+		SELECT COUNT(er.id_) FROM exam_registration er
+		<include refid="queryStudentListSql"/>
+	</select>
+	<sql id="queryStudentListSql">
+		<where>
+			<if test="studentId != null">
+				er.student_id_ = #{studentId}
+			</if>
+			<if test="examRegistrationId != null">
+				er.id_ = #{examRegistrationId}
+			</if>
+			<if test="tenantId != null and tenantId != 0">
+				er.tenant_id_ = #{tenantId}
+			</if>
+			<if test="status != null and status != ''">
+				er.status_ = #{status}
+			</if>
+		</where>
+	</sql>
+	<select id="queryStudentList" resultMap="ExamRegistrationDtoMap">
+		SELECT er.*,eb.enroll_end_time_,eb.enroll_start_time_,eb.expect_exam_end_time_,eb.expect_exam_start_time_,eb.name_ examBaseName
+		FROM exam_registration er
+		LEFT JOIN examination_basic eb ON er.examination_basic_id_ = eb.id_
+		<include refid="queryStudentListSql"/>
+		ORDER BY er.update_time_ DESC
+		<include refid="global.limit"/>
+	</select>
+	<resultMap id="ExamRecordDtoMap" type="com.keao.edu.user.dto.ExamRecordDto" extends="ExamRegistration">
+		<result property="subjectName" column="subjectName"/>
+		<result property="examBaseName" column="examBaseName"/>
+		<result property="examCertificationId" column="examCertificationId"/>
+		<association property="studentExamResult" resultMap="com.keao.edu.user.dao.StudentExamResultDao.StudentExamResult"/>
+	</resultMap>
+	<select id="queryExamList" resultMap="ExamRecordDtoMap">
+		SELECT er.*,ser.* FROM exam_registration er
+		LEFT JOIN student_exam_result ser ON er.id_ = ser.exam_registration_id_
+		WHERE ser.id_ IS NOT NULL AND er.student_id_ = #{studentId}
+	</select>
+	<select id="countExamList" resultType="java.lang.Integer">
+		SELECT COUNT(er.id_) FROM exam_registration er
+		LEFT JOIN student_exam_result ser ON er.id_ = ser.exam_registration_id_
+		WHERE ser.id_ IS NOT NULL AND er.student_id_ = #{studentId}
+	</select>
 
-    <!-- 获取报名信息 -->
-    <select id="getExamRegistration" resultMap="ExamRegistrationDtoMap">
-        SELECT er.*,
-               s.name_       subjectName,
-               su.real_name_ studentName,
-               eb.expect_exam_start_time_,
-               eb.expect_exam_end_time_
-        FROM exam_registration er
-                 LEFT JOIN sys_user su ON su.id_ = er.student_id_
-                 LEFT JOIN examination_basic eb ON er.examination_basic_id_ = eb.id_
-                 LEFT JOIN subject s on er.subject_id_ = s.id_
-        WHERE er.id_ = #{examRegistrationId}
-    </select>
+	<!-- 获取报名信息 -->
+	<select id="getExamRegistration" resultMap="ExamRegistrationDtoMap">
+		SELECT er.*,s.name_ subjectName,su.real_name_ studentName,eb.expect_exam_start_time_,eb.expect_exam_end_time_ FROM exam_registration er
+		LEFT JOIN sys_user su ON su.id_ = er.student_id_
+		LEFT JOIN examination_basic eb ON er.examination_basic_id_ = eb.id_
+		LEFT JOIN subject s on er.subject_id_ = s.id_
+		WHERE er.id_ = #{examRegistrationId}
+	</select>
 
-    <select id="getExamRegistrationInfo" resultMap="ExamRegistration">
-        SELECT er.*,
-               su.id_        sys_user_id_,
-               su.real_name_ sys_user_real_name_,
-               su.phone_     sys_user_phone_,
-               s.id_         subject_id_,
-               s.name_       subject_name_,
-               eb.name_      examination_basic_name_
-        FROM exam_registration er
-                 LEFT JOIN examination_basic eb ON eb.id_ = er.examination_basic_id_
-                 LEFT JOIN sys_user su ON er.student_id_ = su.id_
-                 LEFT JOIN subject s on er.subject_id_ = s.id_
-        WHERE er.id_ = #{id}
-    </select>
+	<select id="getExamRegistrationInfo" resultMap="ExamRegistration">
+		SELECT er.*, su.id_ sys_user_id_, su.real_name_ sys_user_real_name_,su.phone_ sys_user_phone_ , s.id_ subject_id_,
+		s.name_ subject_name_ ,eb.name_ examination_basic_name_
+		FROM exam_registration er
+		LEFT JOIN examination_basic eb ON eb.id_=er.examination_basic_id_
+		LEFT JOIN sys_user su ON er.student_id_ = su.id_
+		LEFT JOIN subject s on er.subject_id_ = s.id_
+		WHERE er.id_ = #{id}
+	</select>
 
-    <select id="getRegistration" resultMap="ExamRegistration">
-        SELECT * FROM exam_registration
-        <where>
-            <if test="examId != null">
-                AND examination_basic_id_ = #{examId}
-            </if>
-            <if test="studentId != null">
-                AND student_id_ =#{studentId}
-            </if>
-            <if test="subjectId != null">
-                AND subject_id_=#{subjectId}
-            </if>
-            <if test="level != null">
-                AND level_ = #{level}
-            </if>
-            <if test="statusEnumList != null">
-                AND status_ IN
-                <foreach collection="statusEnumList" item="status" open="(" close=")" separator=",">
-                    #{status}
-                </foreach>
-            </if>
-        </where>
-        LIMIT 1
-    </select>
+	<select id="getRegistration" resultMap="ExamRegistration">
+		SELECT * FROM exam_registration WHERE examination_basic_id_ = #{examId}  AND student_id_ =#{studentId} AND subject_id_=#{subjectId} AND level_ = #{level} LIMIT 1
+	</select>
 </mapper>

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

@@ -18,7 +18,7 @@
 		<result column="settlement_type_" property="settlementType" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
 		<result column="del_flag_" property="delFlag" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
 		<result column="share_profit_amount_" property="shareProfitAmount" />
-		<result column="is_allow_arrange_exam_" property="isAllowArrangeExam" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
+		<result column="is_allow_arrange_exam_" property="isAllowArrangeExam" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
@@ -48,7 +48,7 @@
 	<insert id="insert" parameterType="com.keao.edu.user.entity.Organization" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO organization (id_,user_id_,name_,contact_name_,contact_phone_,level_,parent_organ_id_,parent_organ_id_tag_,settlement_type_,share_profit_amount_,is_allow_arrange_exam_,create_time_,update_time_,tenant_id_)
 		VALUES(#{id},#{userId},#{name},#{contactName},#{contactPhone},#{level},#{parentOrganId},#{parentOrganIdTag},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
-		#{shareProfitAmount},#{isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(),NOW(),#{tenantId})
+		#{shareProfitAmount},#{isAllowArrangeExam},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -80,7 +80,7 @@
 				name_ = #{name},
 			</if>
 			<if test="isAllowArrangeExam != null">
-				is_allow_arrange_exam_ = #{isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+				is_allow_arrange_exam_ = #{isAllowArrangeExam},
 			</if>
 			<if test="delFlag != null">
 				del_flag_ = #{delFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},

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

@@ -97,7 +97,7 @@
 			<if test="tenantId != null and tenantId != 0">
 				AND t.tenant_id_ = #{tenantId}
 			</if>
-			<if test="organId != null">
+			<if test="organId != null and organId != 0">
 				AND t.organ_id_ = #{organId}
 			</if>
 			<if test="settlementType != null and settlementType != ''">