伴奏修改

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

@@ -18,7 +18,7 @@ public class SysExamSongQueryInfo extends QueryInfo {
     private String type;
 
     @ApiModelProperty(value = "曲库分类",required = true)
-    private Integer categoriesId;
+    private String categoriesId;
 
     @ApiModelProperty(value = "是否收费",required = true)
     private Integer rankType;
@@ -103,11 +103,11 @@ public class SysExamSongQueryInfo extends QueryInfo {
         this.parentId = parentId;
     }
 
-    public Integer getCategoriesId() {
+    public String getCategoriesId() {
         return categoriesId;
     }
 
-    public void setCategoriesId(Integer categoriesId) {
+    public void setCategoriesId(String categoriesId) {
         this.categoriesId = categoriesId;
     }
 

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

@@ -15,6 +15,7 @@ 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.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -64,12 +65,16 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 		if(queryInfo.getCategoriesId() != null){
 			List<Integer> categoriesIdList = new ArrayList<>();
 			MusicScoreQueryInfo musicScoreQueryInfo = new MusicScoreQueryInfo();
-			musicScoreQueryInfo.setParentId(queryInfo.getCategoriesId());
+			Integer categoriesId = null;
+			if(StringUtils.isNotEmpty(queryInfo.getCategoriesId())){
+				categoriesId = Integer.parseInt(queryInfo.getCategoriesId());
+			}
+			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(queryInfo.getCategoriesId());
+				categoriesIdList.add(categoriesId);
 			}
 			queryInfo.setCategoriesIdList(categoriesIdList);
 		}
@@ -106,13 +111,17 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 		if(queryInfo.getCategoriesId() != null){
 			List<Integer> categoriesIdList = new ArrayList<>();
 			MusicScoreQueryInfo musicScoreQueryInfo = new MusicScoreQueryInfo();
-			musicScoreQueryInfo.setParentId(queryInfo.getCategoriesId());
+			Integer categoriesId = null;
+			if(StringUtils.isNotEmpty(queryInfo.getCategoriesId())){
+				categoriesId = Integer.parseInt(queryInfo.getCategoriesId());
+			}
+			musicScoreQueryInfo.setParentId(categoriesId);
 			musicScoreQueryInfo.setOrganId(queryInfo.getOrganId());
 			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());
+				categoriesIdList.add(categoriesId);
 			}
 			queryInfo.setCategoriesIdList(categoriesIdList);
 		}

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

@@ -116,7 +116,7 @@
 				sm.parent_id_ = #{parentId}
 			</if>
 			<if test="enable != null">
-				AND sm.enable_ = 1
+				AND sm.enable_ = #{enable}
 			</if>
 			<if test="search != null and search != ''">
 				AND (sm.id_ = #{search} OR sm.name_ LIKE CONCAT('%',#{search},'%'))

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

@@ -118,7 +118,7 @@
 		<where>
 			ses.del_flag_ = 0
 			<if test="categoriesId != null">
-				AND ses.music_score_categories_id_ = #{categoriesId}
+				AND FIND_IN_SET(ses.music_score_categories_id_,#{categoriesId})
 			</if>
 			<if test="search != null and search != ''">
 				AND (ses.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.biz.dal.dao.SysMusicScoreCategoriesDao;
 import com.ym.mec.biz.dal.dto.MusicScoreDto;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
@@ -19,6 +20,8 @@ public class SysMusicScoreController extends BaseController {
 
     @Autowired
     private SysMusicScoreService sysMusicScoreService;
+    @Autowired
+    private SysMusicScoreCategoriesDao sysMusicScoreCategoriesDao;
 
     @ApiOperation(value = "修改")
     @PostMapping("/update")
@@ -61,6 +64,11 @@ public class SysMusicScoreController extends BaseController {
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScore/queryPage')")
     public Object queryPage(SysExamSongQueryInfo queryInfo) {
+        if(queryInfo.getCategoriesId() != null){
+            String byCategoriesIds = sysMusicScoreCategoriesDao.findByCategoriesIds(queryInfo.getCategoriesId().toString());
+            byCategoriesIds = sysMusicScoreCategoriesDao.findByCategoriesIds(byCategoriesIds);
+            queryInfo.setCategoriesId(byCategoriesIds);
+        }
         return succeed(sysMusicScoreService.queryPage(queryInfo));
     }
 }