Merge remote-tracking branch 'origin/master'

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

@@ -313,4 +313,12 @@
 		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_
+		FROM exam_registration er
+		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>
 </mapper>

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

@@ -155,7 +155,7 @@
     </select>
 
     <resultMap id="pageList" type="com.keao.edu.user.entity.ExamRegistrationPayment" extends="ExamRegistrationPayment">
-        <association property="examRegistration" select="com.keao.edu.user.dao.ExamRegistrationDao.get" column="{id=exam_registration_id_}"/>
+        <association property="examRegistration" select="com.keao.edu.user.dao.ExamRegistrationDao.getExamRegistrationInfo" column="{id=exam_registration_id_}"/>
     </resultMap>
     <!-- 获取订单列表 -->
     <select id="getOrderPageList" resultMap="pageList">