zouxuan пре 4 година
родитељ
комит
80964f9a94

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

@@ -19,6 +19,16 @@ public class SysExamSongQueryInfo extends QueryInfo {
 
     private Integer sysMusicScoreId;
 
+    private Integer parentId;
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
     public Integer getCategoriesId() {
         return categoriesId;
     }

+ 8 - 0
mec-biz/src/main/resources/config/mybatis/SysMusicScoreAccompanimentMapper.xml

@@ -128,6 +128,7 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(sesa.id_) FROM sys_music_score_accompaniment sesa
 		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
+		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		<include refid="queryPageSql"/>
 	</select>
 
@@ -158,6 +159,7 @@
 	<select id="findAccCount" resultType="java.lang.Integer">
 		SELECT COUNT(DISTINCT sesa.id_) FROM sys_music_score_accompaniment sesa
 		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
+		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		<include refid="queryPageSql"/>
 	</select>
 
@@ -170,6 +172,12 @@
 			<if test="sysMusicScoreId != null">
 				AND sesa.exam_song_id_ = #{sysMusicScoreId}
 			</if>
+			<if test="categoriesId != null">
+				AND sesc.id_ = #{categoriesId}
+			</if>
+			<if test="parentId != null">
+				AND sesc.parent_id_ = #{parentId}
+			</if>
 			<if test="subjectId != null">
 				AND sesa.subject_id_ = #{subjectId}
 			</if>