zouxuan 5 years ago
parent
commit
00032416e4

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/page/MusicCalenderDetailQueryInfo.java

@@ -11,8 +11,18 @@ public class MusicCalenderDetailQueryInfo extends QueryInfo {
 
 	private Integer subjectId;
 
+	private String musicGroupId;
+
 	private Long id;
 
+	public String getMusicGroupId() {
+		return musicGroupId;
+	}
+
+	public void setMusicGroupId(String musicGroupId) {
+		this.musicGroupId = musicGroupId;
+	}
+
 	public Integer getSubjectId() {
 		return subjectId;
 	}

+ 2 - 0
mec-biz/src/main/resources/config/mybatis/MusicGroupStudentFeeMapper.xml

@@ -130,6 +130,7 @@
         LEFT JOIN sys_user su ON su.id_ = mgsf.user_id_
         LEFT JOIN `subject` s ON s.id_ = mgsf.subject_id_
         <where>
+            mgsf.music_group_id_ = #{musicGroupId}
             <if test="search != null and search != ''">
                 AND (mgsf.user_id_ = #{search}
                 OR su.username_ LIKE CONCAT('%',#{search},'%')
@@ -148,6 +149,7 @@
         SELECT COUNT(mgsf.id_) FROM music_group_student_fee_ mgsf
         LEFT JOIN sys_user su ON su.id_ = mgsf.user_id_
         <where>
+            mgsf.music_group_id_ = #{musicGroupId}
             <if test="search != null and search != ''">
                 AND (mgsf.user_id_ = #{search}
                 OR su.username_ LIKE CONCAT('%',#{search},'%')