Merge remote-tracking branch 'origin/master'

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

@@ -8,6 +8,9 @@ import java.util.List;
 
 public class ExamRegistrationPaymentDto extends ExamRegistrationPayment {
 
+    @ApiModelProperty(value = "准考证号")
+    private String cardNo;
+
     @ApiModelProperty(value = "考试地点")
     private List<ExamLocation> examLocations;
 
@@ -18,4 +21,12 @@ public class ExamRegistrationPaymentDto extends ExamRegistrationPayment {
     public void setExamLocations(List<ExamLocation> examLocations) {
         this.examLocations = examLocations;
     }
+
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
 }

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

@@ -151,7 +151,7 @@
 
     <!-- 分页查询 -->
     <select id="getOrderPageList" resultMap="ExamRegistrationPaymentDto" parameterType="map">
-        SELECT erp.*,eb.exam_location_id_list_ FROM exam_registration_payment erp
+        SELECT erp.*,eb.exam_location_id_list_,ec.card_no_ FROM exam_registration_payment erp
         LEFT JOIN exam_certification ec ON erp.exam_registration_id_ = ec.exam_registration_id_
         LEFT JOIN examination_basic eb ON erp.examination_basic_id_ = eb.id_
         <include refid="queryCondition" />
@@ -198,6 +198,7 @@
     </select>
 
     <resultMap id="ExamRegistrationPaymentDto" type="com.keao.edu.user.dto.ExamRegistrationPaymentDto" extends="ExamRegistrationPayment">
+        <result column="card_no_" property="cardNo"/>
         <association property="examRegistration" select="com.keao.edu.user.dao.ExamRegistrationDao.getExamRegistrationInfo" column="{id=exam_registration_id_}"/>
         <association property="examLocations"  select="com.keao.edu.user.dao.ExamLocationDao.getExamLocationByIds" column="{ids=exam_location_id_list_}"/>
     </resultMap>