Преглед на файлове

增加小班,添加学员接口

周箭河 преди 5 години
родител
ревизия
2bf7841531

+ 12 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentRegistration.java

@@ -85,9 +85,12 @@ public class StudentRegistration {
     @ApiModelProperty(value = "用户所在乐团状态)",required = false)
     private ClassGroupStudentStatusEnum musicGroupStatus;
 
-    @ApiModelProperty(value = "班级ids", required = true)
+    @ApiModelProperty(value = "班级id", required = true)
     private Integer classGroupId;
 
+    @ApiModelProperty(value = "班级名称", required = true)
+    private String classGroupName;
+
     @ApiModelProperty(value = "零时课程费用", required = true)
     private BigDecimal temporaryCourseFee;
 
@@ -293,6 +296,14 @@ public class StudentRegistration {
         this.subjectName = subjectName;
     }
 
+    public String getClassGroupName() {
+        return classGroupName;
+    }
+
+    public void setClassGroupName(String classGroupName) {
+        this.classGroupName = classGroupName;
+    }
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

+ 5 - 2
mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -29,6 +29,7 @@
         <result column="payment_status_" property="paymentStatus"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="music_group_status_" property="musicGroupStatus"/>
+        <result column="class_group_name_" property="classGroupName" />
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.StudentInfo" id="StudentInfo">
@@ -331,9 +332,11 @@
 
     <!-- 获取乐团声部下的学生 -->
     <select id="findMusicGroupStudent" resultMap="StudentRegistration">
-        SELECT * FROM student_registration WHERE music_group_id_ = #{musicGroupId}
+        SELECT sr.*,cg.name_ class_group_name_  FROM student_registration sr
+        LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
+        WHERE sr.music_group_id_ = #{musicGroupId}
         <if test="actualSubjectId != null and actualSubjectId !=''">
-            AND actual_subject_id_ = #{actualSubjectId}
+            AND sr.actual_subject_id_ = #{actualSubjectId}
         </if>
         AND payment_status_ = 1;
     </select>