update

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

@@ -64,6 +64,12 @@ public class ExamRegistrationDto{
     @ApiModelProperty(value = "报名开始时间")
     private String enrollStartTime;
 
+    @ApiModelProperty(value = "演奏曲列表（用逗号分隔）")
+    private String performSongIdList;
+
+    @ApiModelProperty(value = "练习曲列表（用逗号分隔）")
+    private String practiceSongIdList;
+
     @ApiModelProperty(value = "报名结束时间")
     private String enrollEndTime;
 
@@ -75,6 +81,22 @@ public class ExamRegistrationDto{
 
     private String studentName;
 
+    public String getPerformSongIdList() {
+        return performSongIdList;
+    }
+
+    public void setPerformSongIdList(String performSongIdList) {
+        this.performSongIdList = performSongIdList;
+    }
+
+    public String getPracticeSongIdList() {
+        return practiceSongIdList;
+    }
+
+    public void setPracticeSongIdList(String practiceSongIdList) {
+        this.practiceSongIdList = practiceSongIdList;
+    }
+
     public Long getId() {
         return id;
     }

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

@@ -462,6 +462,8 @@
 		<result property="examEndTime" column="expect_exam_end_time_"/>
 		<result property="enrollEndTime" column="enroll_end_time_"/>
 		<result property="enrollStartTime" column="enroll_start_time_"/>
+		<result property="performSongIdList" column="perform_song_id_list_"/>
+		<result property="practiceSongIdList" column="practice_song_id_list_"/>
 	</resultMap>
     <select id="countStudentList" resultType="java.lang.Integer">
 		SELECT COUNT(er.id_) FROM exam_registration er
@@ -477,18 +479,20 @@
 			</if>
 			<if test="paymentStatus != null and paymentStatus == 1">
 				<if test="paymentStatus == 1">
-					AND er.status_ = 'AUDIT_PASS'
+					AND er.status_ IN ('AUDIT_PASS','AUDIT_WAIT','AUDIT_REJECT')
 				</if>
 				<if test="paymentStatus == 0">
-					AND er.status_ != 'AUDIT_PASS'
+					AND er.status_ IN ('CANCEL','PAY_WAIT')
 				</if>
 			</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
+		SELECT er.*,eb.enroll_end_time_,eb.enroll_start_time_,eb.expect_exam_end_time_,
+		eb.expect_exam_start_time_,eb.name_ examBaseName,ess.practice_song_id_list_,ess.perform_song_id_list_
 		FROM exam_registration er
 		LEFT JOIN examination_basic eb ON er.examination_basic_id_ = eb.id_
+		LEFT JOIN exam_subject_song ess ON er.examination_basic_id_ = ess.examination_basic_id_
 		<include refid="queryStudentListSql"/>
 		ORDER BY er.update_time_ DESC
 		<include refid="global.limit"/>