智能陪练声部查询列表

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysMusicScoreAccompanimentDao.java

@@ -31,5 +31,5 @@ public interface SysMusicScoreAccompanimentDao extends BaseDAO<Integer, SysMusic
      * 获取伴奏声部列表
      * @return
      */
-    List<Subject> querySubjectIds();
+    List<Subject> querySubjectIds(@Param("categoriesIdList") List<Integer> categoriesIdList);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/SysMusicScoreAccompanimentService.java

@@ -18,7 +18,7 @@ public interface SysMusicScoreAccompanimentService extends BaseService<Integer,
 
     List<SysMusicScoreAccompaniment> queryAccPage(SysExamSongQueryInfo queryInfo);
 
-    List<Subject> querySubjectIds();
+    List<Subject> querySubjectIds(Integer categoriesId);
 
     PageInfo<SysMusicScoreAccompaniment> queryScorePage(SysExamSongQueryInfo queryInfo);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreAccompanimentServiceImpl.java

@@ -79,8 +79,19 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 	}
 
 	@Override
-	public List<Subject> querySubjectIds() {
-		return sysMusicScoreAccompanimentDao.querySubjectIds();
+	public List<Subject> querySubjectIds(Integer categoriesId) {
+		List<Integer> categoriesIdList = new ArrayList<>();
+		if(categoriesId != null){
+			MusicScoreQueryInfo musicScoreQueryInfo = new MusicScoreQueryInfo();
+			musicScoreQueryInfo.setParentId(categoriesId);
+			List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesService.queryTree(musicScoreQueryInfo);
+			if(scoreCategories.size() > 0){
+				categoriesIdList = scoreCategories.stream().map(e->e.getId()).collect(Collectors.toList());
+			}else {
+				categoriesIdList.add(categoriesId);
+			}
+		}
+		return sysMusicScoreAccompanimentDao.querySubjectIds(categoriesIdList);
 	}
 
     @Override

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

@@ -168,7 +168,15 @@
     <select id="querySubjectIds" resultMap="com.ym.mec.biz.dal.dao.SubjectDao.Subject">
 		SELECT s.* FROM sys_music_score_accompaniment sesa
 		LEFT JOIN `subject` s ON s.id_ = sesa.subject_id_
+		LEFT JOIN sys_music_score sms ON sms.id_ = sesa.exam_song_id_
+		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = sms.music_score_categories_id_
 		WHERE sesa.del_flag_ = 0 AND sesa.subject_id_ IS NOT NULL
+		<if test="categoriesIdList != null and categoriesIdList.size > 0">
+			AND sesc.id_ IN
+			<foreach collection="categoriesIdList" separator="," item="item" open="(" close=")">
+				#{item}
+			</foreach>
+		</if>
 		GROUP BY sesa.subject_id_
 	</select>
 

mec-student/src/main/java/com/ym/mec/student/controller/SysMusicScoreAccompanimentController.java

@@ -41,7 +41,7 @@ public class SysMusicScoreAccompanimentController extends BaseController {
 
     @ApiOperation(value = "获取伴奏声部列表")
     @GetMapping("/querySubjectIds")
-    public Object querySubjectIds() {
-        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    public Object querySubjectIds(Integer categoriesId) {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds(categoriesId));
     }
 }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMusicScoreAccompanimentController.java

@@ -40,8 +40,8 @@ public class SysMusicScoreAccompanimentController extends BaseController {
 
     @ApiOperation(value = "获取伴奏声部列表")
     @GetMapping("/querySubjectIds")
-    public Object querySubjectIds() {
-        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    public Object querySubjectIds(Integer categoriesId) {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds(categoriesId));
     }
 
     @ApiOperation(value = "分页查询")

mec-web/src/main/java/com/ym/mec/web/controller/SysMusicScoreAccompanimentController.java

@@ -45,7 +45,7 @@ public class SysMusicScoreAccompanimentController extends BaseController {
 
     @ApiOperation(value = "获取伴奏声部列表")
     @GetMapping("/querySubjectIds")
-    public Object querySubjectIds() {
-        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    public Object querySubjectIds(Integer categoriesId) {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds(categoriesId));
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicScoreController.java

@@ -52,7 +52,7 @@ public class EduMusicScoreController extends BaseController {
 
     @ApiOperation(value = "获取伴奏声部列表")
     @GetMapping("/querySubjectIds")
-    public Object querySubjectIds() {
-        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    public Object querySubjectIds(Integer categoriesId) {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds(categoriesId));
     }
 }