Merge remote-tracking branch 'origin/master'

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

@@ -73,6 +73,8 @@ public class ExamRegistrationDto{
     @ApiModelProperty(value = "预计考试结束时间")
     private String examEndTime;
 
+    private String studentName;
+
     public Long getId() {
         return id;
     }
@@ -248,4 +250,12 @@ public class ExamRegistrationDto{
     public void setPaymentOrderNo(String paymentOrderNo) {
         this.paymentOrderNo = paymentOrderNo;
     }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
 }

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

@@ -441,6 +441,7 @@
 		<result column="card_no_" property="cardNo" />
 		<result column="status_" property="status" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
 		<result column="memo_" property="memo" />
+		<result property="studentName" column="studentName"/>
 		<result property="subjectName" column="subjectName"/>
 		<result property="examBaseName" column="examBaseName"/>
 		<result property="examStartTime" column="expect_exam_start_time_"/>

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

@@ -11,7 +11,6 @@
 		<result column="certificate_photo_" property="certificatePhoto" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
-		<result column="organ_id_" property="organId" />
 		<association property="sysUser" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
 	</resultMap>
 
@@ -28,8 +27,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.api.entity.Student" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO student (user_id_,certificate_photo_,create_time_,update_time_,organ_id_)
-		VALUES(#{userId},#{certificatePhoto},NOW(),NOW(),#{organId})
+		INSERT INTO student (user_id_,certificate_photo_,create_time_,update_time_)
+		VALUES(#{userId},#{certificatePhoto},NOW(),NOW())
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -39,9 +38,6 @@
 			<if test="certificatePhoto != null">
 				certificate_photo_ = #{certificatePhoto},
 			</if>
-			<if test="organId != null">
-				organ_id_ = #{organId},
-			</if>
 			update_time_ = NOW()
 		</set> WHERE user_id_ = #{userId}
 	</update>
@@ -52,9 +48,6 @@
 
 	<sql id="queryCondition">
 		<where>
-			<if test="tenantId != null and tenantId != 0">
-				AND stu.tenant_id_ = #{tenantId}
-			</if>
 			<if test="search != null and search != ''">
 				AND (stu.user_id_ = #{search} OR su.real_name_ LIKE CONCAT (#{search}, '%'))
 			</if>