Browse Source

fix musicGroup reg

周箭河 5 years ago
parent
commit
c02dced06d

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicCardDto.java

@@ -4,6 +4,8 @@ import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 public class MusicCardDto {
+    @ApiModelProperty(value = "报名id",required = true)
+    private String registerId;
 
     @ApiModelProperty(value = "用户姓名",required = true)
     private String userName;
@@ -103,4 +105,12 @@ public class MusicCardDto {
     public void setPaymentStatus(YesOrNoEnum paymentStatus) {
         this.paymentStatus = paymentStatus;
     }
+
+    public String getRegisterId() {
+        return registerId;
+    }
+
+    public void setRegisterId(String registerId) {
+        this.registerId = registerId;
+    }
 }

+ 2 - 1
mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -133,6 +133,7 @@
 	</select>
 
 	<resultMap type="com.ym.mec.biz.dal.dto.MusicCardDto" id="queryUserMusicGroupsMap">
+		<result column="register_id_" property="registerId" />
 		<result column="user_name_" property="userName" />
 		<result column="subject_name_" property="subjectName" />
 		<result column="current_class_" property="currentClass" />
@@ -145,7 +146,7 @@
 	</resultMap>
 
     <select id="queryUserMusicGroups" resultMap="queryUserMusicGroupsMap">
-		SELECT sr.name_ user_name_,sr.current_class_,sr.current_grade_,
+		SELECT sr.id_ register_id_,sr.name_ user_name_,sr.current_class_,sr.current_grade_,
 		sr.payment_status_,mg.name_ music_group_name_,s.name_ subject_name_,mg.id_ music_group_id_
 		FROM student_registration sr
 		LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_