教学伴奏，分类正序，查看夫级分类时，同时查询出所包含子集的分类伴奏

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

@@ -4,6 +4,8 @@ import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.List;
+
 public class SysExamSongQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "上传人",required = true)
@@ -26,6 +28,16 @@ public class SysExamSongQueryInfo extends QueryInfo {
 
     private ClientTypeEnum clientType;
 
+    private List<Integer> categoriesIdList;
+
+    public List<Integer> getCategoriesIdList() {
+        return categoriesIdList;
+    }
+
+    public void setCategoriesIdList(List<Integer> categoriesIdList) {
+        this.categoriesIdList = categoriesIdList;
+    }
+
     public ClientTypeEnum getClientType() {
         return clientType;
     }

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

@@ -2,8 +2,10 @@ package com.ym.mec.biz.service;
 
 
 import com.ym.mec.biz.dal.entity.Subject;
+import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.List;
@@ -17,4 +19,6 @@ public interface SysMusicScoreAccompanimentService extends BaseService<Integer,
     List<SysMusicScoreAccompaniment> queryAccPage(SysExamSongQueryInfo queryInfo);
 
     List<Subject> querySubjectIds();
+
+    PageInfo<SysMusicScoreAccompaniment> queryScorePage(SysExamSongQueryInfo queryInfo);
 }

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

@@ -1,13 +1,18 @@
 package com.ym.mec.biz.service.impl;
 
 
+import com.ym.mec.auth.api.dto.MusicScoreQueryInfo;
 import com.ym.mec.biz.dal.dao.SysMusicScoreAccompanimentDao;
 import com.ym.mec.biz.dal.entity.Subject;
+import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
+import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreAccompanimentService;
+import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,12 +22,15 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integer, SysMusicScoreAccompaniment> implements SysMusicScoreAccompanimentService {
 	
 	@Autowired
 	private SysMusicScoreAccompanimentDao sysMusicScoreAccompanimentDao;
+	@Autowired
+	private SysMusicScoreCategoriesService sysMusicScoreCategoriesService;
 
 	@Override
 	public BaseDAO<Integer, SysMusicScoreAccompaniment> getDAO() {
@@ -62,4 +70,21 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 	public List<Subject> querySubjectIds() {
 		return sysMusicScoreAccompanimentDao.querySubjectIds();
 	}
+
+    @Override
+    public PageInfo<SysMusicScoreAccompaniment> queryScorePage(SysExamSongQueryInfo queryInfo) {
+		if(queryInfo.getCategoriesId() != null){
+			List<Integer> categoriesIdList = new ArrayList<>();
+			MusicScoreQueryInfo musicScoreQueryInfo = new MusicScoreQueryInfo();
+			musicScoreQueryInfo.setParentId(queryInfo.getCategoriesId());
+			List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesService.queryTree(musicScoreQueryInfo);
+			if(scoreCategories.size() > 0){
+				categoriesIdList = scoreCategories.stream().map(e->e.getId()).collect(Collectors.toList());
+			}else {
+				categoriesIdList.add(queryInfo.getCategoriesId());
+			}
+			queryInfo.setCategoriesIdList(categoriesIdList);
+		}
+		return this.queryPage(queryInfo);
+    }
 }

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

@@ -184,8 +184,11 @@
 			<if test="sysMusicScoreId != null">
 				AND sesa.exam_song_id_ = #{sysMusicScoreId}
 			</if>
-			<if test="categoriesId != null">
-				AND sesc.id_ = #{categoriesId}
+			<if test="categoriesIdList != null">
+				AND sesc.id_ IN
+				<foreach collection="categoriesIdList" separator="," item="item" open="(" close=")">
+					#{item}
+				</foreach>
 			</if>
 			<if test="parentId != null">
 				AND sesc.parent_id_ = #{parentId}

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

@@ -63,7 +63,7 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScoreCategories" parameterType="map">
-		SELECT * FROM sys_music_score_categories ORDER BY id_
+		SELECT * FROM sys_music_score_categories ORDER BY id_ DESC
 		<include refid="global.limit"/>
 	</select>
 	

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

@@ -34,7 +34,7 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         if(queryInfo.getClientType() == null){
             queryInfo.setClientType(ClientTypeEnum.NETWORK_ROOM);
         }
-        return succeed(sysMusicScoreAccompanimentService.queryPage(queryInfo));
+        return succeed(sysMusicScoreAccompanimentService.queryScorePage(queryInfo));
     }
 
     @ApiOperation(value = "获取伴奏声部列表")

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

@@ -77,6 +77,6 @@ public class SysMusicScoreAccompanimentController extends BaseController {
             queryInfo.setClientType(ClientTypeEnum.NETWORK_ROOM);
         }
         queryInfo.setCreateUserId(sysUser.getId());
-        return succeed(sysMusicScoreAccompanimentService.queryPage(queryInfo));
+        return succeed(sysMusicScoreAccompanimentService.queryScorePage(queryInfo));
     }
 }