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

edu-im/edu-im-server/pom.xml

@@ -65,6 +65,12 @@
 		<dependency>
 			<groupId>com.keao.edu</groupId>
 			<artifactId>edu-auth-api</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>com.keao.edu</groupId>
+					<artifactId>edu-thirdparty</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.keao.edu</groupId>

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

@@ -10,6 +10,9 @@ public class ExamCertification {
 
 	private Long id;
 
+	@ApiModelProperty(value = "学员报名编号")
+	private Long examRegistrationId;
+
 	@ApiModelProperty(value = "考级项目编号")
 	private Integer examinationBasicId;
 
@@ -39,7 +42,15 @@ public class ExamCertification {
 	private java.util.Date updateTime;
 
 	private String tenantId;
-	
+
+	public Long getExamRegistrationId() {
+		return examRegistrationId;
+	}
+
+	public void setExamRegistrationId(Long examRegistrationId) {
+		this.examRegistrationId = examRegistrationId;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}

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

@@ -1,6 +1,5 @@
 package com.keao.edu.user.entity;
 
-import com.keao.edu.user.enums.ExamEvaluationResultEnum;
 import com.keao.edu.user.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -13,6 +12,9 @@ public class ExamReview {
 	/**  */
 	private Long id;
 
+	@ApiModelProperty(value = "学员报考编号")
+	private Long examRegistrationId;
+
 	@ApiModelProperty(value = "考试编号")
 	private Integer examinationBasicId;
 	
@@ -44,6 +46,14 @@ public class ExamReview {
 	@ApiModelProperty(value = "考试基本信息")
 	private ExaminationBasic examinationBasic;
 
+	public Long getExamRegistrationId() {
+		return examRegistrationId;
+	}
+
+	public void setExamRegistrationId(Long examRegistrationId) {
+		this.examRegistrationId = examRegistrationId;
+	}
+
 	public ExaminationBasic getExaminationBasic() {
 		return examinationBasic;
 	}

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

@@ -10,6 +10,9 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class StudentExamResult {
 
 	private Long id;
+
+	@ApiModelProperty(value = "学员报考编号")
+	private Long examRegistrationId;
 	
 	@ApiModelProperty(value = "考级项目编号")
 	private Integer examinationBasicId;
@@ -43,7 +46,15 @@ public class StudentExamResult {
 	private java.util.Date updateTime;
 
 	private String tenantId;
-	
+
+	public Long getExamRegistrationId() {
+		return examRegistrationId;
+	}
+
+	public void setExamRegistrationId(Long examRegistrationId) {
+		this.examRegistrationId = examRegistrationId;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}

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

@@ -9,6 +9,7 @@
 	<resultMap type="com.keao.edu.user.entity.ExamCertification" id="ExamCertification">
 		<result column="id_" property="id" />
 		<result column="examination_basic_id_" property="examinationBasicId" />
+		<result column="exam_registration_id_" property="examRegistrationId" />
 		<result column="student_id_" property="studentId" />
 		<result column="card_no_" property="cardNo" />
 		<result column="subject_id_" property="subjectId" />
@@ -34,18 +35,18 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamCertification" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO exam_certification (id_,examination_basic_id_,student_id_,card_no_,subject_id_,
-		level_,exam_start_time_,exam_end_time_,exam_address_,create_time_,update_time_,tenant_id_)
+		level_,exam_start_time_,exam_end_time_,exam_address_,create_time_,update_time_,tenant_id_,exam_registration_id_)
 		VALUES(#{id},#{examinationBasicId},#{studentId},#{cardNo},#{subjectId},#{level},#{examStartTime},
-		#{examEndTime},#{examAddress},NOW(),NOW(),#{tenantId})
+		#{examEndTime},#{examAddress},NOW(),NOW(),#{tenantId},#{examRegistrationId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.keao.edu.user.entity.ExamCertification" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO exam_certification (examination_basic_id_,student_id_,card_no_,subject_id_,
-		level_,exam_start_time_,exam_end_time_,exam_address_,create_time_,update_time_,tenant_id_)
+		level_,exam_start_time_,exam_end_time_,exam_address_,create_time_,update_time_,tenant_id_,exam_registration_id_)
 		VALUES
 		<foreach collection="ecs" item="ec" separator=",">
 			(#{ec.examinationBasicId},#{ec.studentId},#{ec.cardNo},#{ec.subjectId},#{ec.level},#{ec.examStartTime},
-			#{ec.examEndTime},#{ec.examAddress},NOW(),NOW(),#{ec.tenantId})
+			#{ec.examEndTime},#{ec.examAddress},NOW(),NOW(),#{ec.tenantId},#{ec.examRegistrationId})
 		</foreach>
 	</insert>
 	
@@ -56,6 +57,9 @@
 			<if test="examinationBasicId != null">
 				examination_basic_id_ = #{examinationBasicId},
 			</if>
+			<if test="examRegistrationId != null">
+				exam_registration_id_ = #{examRegistrationId},
+			</if>
 			<if test="subjectId != null">
 				subject_id_ = #{subjectId},
 			</if>

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

@@ -9,6 +9,7 @@
 	<resultMap type="com.keao.edu.user.entity.ExamReview" id="ExamReview">
 		<result column="id_" property="id" />
 		<result column="examination_basic_id_" property="examinationBasicId" />
+		<result column="exam_registration_id_" property="examRegistrationId" />
 		<result column="teacher_id_" property="teacherId" />
 		<result column="student_id_" property="studentId" />
 		<result column="evaluation_content_" property="evaluationContent" />
@@ -37,9 +38,10 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamReview" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO exam_review (id_,examination_basic_id_,teacher_id_,student_id_,evaluation_content_,
-		evaluation_result_,create_time_,update_time_,tenant_id_,enable_edit_)
+		evaluation_result_,create_time_,update_time_,tenant_id_,enable_edit_,exam_registration_id_)
 		VALUES(#{id},#{examinationBasicId},#{teacherId},#{studentId},#{evaluationContent},
-		#{evaluationResult,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(),NOW(),#{tenantId},#{enableEdit,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler})
+		#{evaluationResult,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(),NOW(),
+		#{tenantId},#{enableEdit,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{examRegistrationId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -49,6 +51,9 @@
 			<if test="examinationBasicId != null">
 				examination_basic_id_ = #{examinationBasicId},
 			</if>
+			<if test="examRegistrationId != null">
+				exam_registration_id_ = #{examRegistrationId},
+			</if>
 			<if test="teacherId != null">
 				teacher_id_ = #{teacherId},
 			</if>

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

@@ -8,6 +8,7 @@
 	
 	<resultMap type="com.keao.edu.user.entity.StudentExamResult" id="StudentExamResult">
 		<result column="id_" property="id" />
+		<result column="exam_registration_id_" property="examRegistrationId" />
 		<result column="examination_basic_id_" property="examinationBasicId" />
 		<result column="student_id_" property="studentId" />
 		<result column="result_" property="result" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler" />
@@ -34,16 +35,19 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.StudentExamResult" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO student_exam_result (id_,examination_basic_id_,student_id_,result_,avg_score_,confirm_status_,memo_,operator_id_,is_finished_exam_,create_time_,update_time_,tenant_id_)
-		VALUES(#{id},#{examinationBasicId},#{studentId},#{result,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{avgScore},#{confirmStatus},#{memo},#{operatorId},#{isFinishedExam},NOW(),NOW(),#{tenantId})
+		INSERT INTO student_exam_result (id_,examination_basic_id_,student_id_,result_,avg_score_,
+		confirm_status_,memo_,operator_id_,is_finished_exam_,create_time_,update_time_,tenant_id_,exam_registration_id_)
+		VALUES(#{id},#{examinationBasicId},#{studentId},#{result,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+		#{avgScore},#{confirmStatus},#{memo},#{operatorId},#{isFinishedExam},NOW(),NOW(),#{tenantId},#{examRegistrationId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.keao.edu.user.entity.StudentExamResult" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO student_exam_result (examination_basic_id_,student_id_,result_,#{avg_score_},confirm_status_,memo_,operator_id_,is_finished_exam_,create_time_,update_time_,tenant_id_)
+		INSERT INTO student_exam_result (examination_basic_id_,student_id_,result_,#{avg_score_},
+		confirm_status_,memo_,operator_id_,is_finished_exam_,create_time_,update_time_,tenant_id_,exam_registration_id_)
 		VALUES
 		<foreach collection="results" item="result" separator=",">
 			(#{result.examinationBasicId},#{result.studentId},#{result.result,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
-			#{result.avgScore},#{result.confirmStatus},#{result.memo},#{result.operatorId},#{result.isFinishedExam},NOW(),NOW(),#{result.tenantId})
+			#{result.avgScore},#{result.confirmStatus},#{result.memo},#{result.operatorId},#{result.isFinishedExam},NOW(),NOW(),#{result.tenantId},#{result.examRegistrationId})
 		</foreach>
 	</insert>
 
@@ -51,6 +55,9 @@
 	<update id="update" parameterType="com.keao.edu.user.entity.StudentExamResult">
 		UPDATE student_exam_result
 		<set>
+			<if test="examRegistrationId != null">
+				exam_registration_id_ = #{examRegistrationId},
+			</if>
 			<if test="examinationBasicId != null">
 				examination_basic_id_ = #{examinationBasicId},
 			</if>