管乐迷曲目来源内容平台

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

@@ -3,9 +3,11 @@ package com.ym.mec.biz.dal.page;
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.List;
 
+@Data
 public class SysExamSongQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "上传人",required = true)
@@ -14,6 +16,9 @@ public class SysExamSongQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "声部",required = true)
     private Integer subjectId;
 
+    @ApiModelProperty(value = "声部",required = true)
+    private String subjectIds;
+
     @ApiModelProperty(value = "类型",required = true)
     private String type;
 
@@ -42,124 +47,4 @@ public class SysExamSongQueryInfo extends QueryInfo {
     private Boolean enable;
 
     private String organId;
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public String getOrganId() {
-        return organId;
-    }
-
-    public void setOrganId(String organId) {
-        this.organId = organId;
-    }
-
-    public Integer getShowFlag() {
-        return showFlag;
-    }
-
-    public void setShowFlag(Integer showFlag) {
-        this.showFlag = showFlag;
-    }
-
-    public Integer getRankType() {
-        return rankType;
-    }
-
-    public void setRankType(Integer rankType) {
-        this.rankType = rankType;
-    }
-
-    public List<Integer> getCategoriesIdList() {
-        return categoriesIdList;
-    }
-
-    public void setCategoriesIdList(List<Integer> categoriesIdList) {
-        this.categoriesIdList = categoriesIdList;
-    }
-
-    public ClientTypeEnum getClientType() {
-        return clientType;
-    }
-
-    public void setClientType(ClientTypeEnum clientType) {
-        this.clientType = clientType;
-    }
-
-    public Boolean getIsShowFingering() {
-        return isShowFingering;
-    }
-
-    public void setIsShowFingering(Boolean showFingering) {
-        isShowFingering = showFingering;
-    }
-
-    public Integer getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Integer parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getCategoriesId() {
-        return categoriesId;
-    }
-
-    public void setCategoriesId(String categoriesId) {
-        this.categoriesId = categoriesId;
-    }
-
-    public Integer getSysMusicScoreId() {
-        return sysMusicScoreId;
-    }
-
-    public void setSysMusicScoreId(Integer sysMusicScoreId) {
-        this.sysMusicScoreId = sysMusicScoreId;
-    }
-
-    public Integer getCreateUserId() {
-        return createUserId;
-    }
-
-    public void setCreateUserId(Integer createUserId) {
-        this.createUserId = createUserId;
-    }
-
-    public Integer getSubjectId() {
-        return subjectId;
-    }
-
-    public void setSubjectId(Integer subjectId) {
-        this.subjectId = subjectId;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-	public String getFilterCategoriesIds() {
-		return filterCategoriesIds;
-	}
-
-	public void setFilterCategoriesIds(String filterCategoriesIds) {
-		this.filterCategoriesIds = filterCategoriesIds;
-	}
-
-	public String getCategoriesIds() {
-		return categoriesIds;
-	}
-
-	public void setCategoriesIds(String categoriesIds) {
-		this.categoriesIds = categoriesIds;
-	}
 }

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

@@ -292,6 +292,9 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
     public List<SysMusicScore> queryMusicScoreAll(SysExamSongQueryInfo queryInfo) {
         //封装查询参数
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
+        if(queryInfo.getSubjectId() != null){
+            queryInfo.setSubjectIds(queryInfo.getSubjectId().toString());
+        }
         this.initCategoryIds(queryInfo);
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
@@ -306,6 +309,9 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
     public PageInfo<SysMusicScore> queryMusicScorePage(SysExamSongQueryInfo queryInfo) {
         //封装查询参数
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
+        if(queryInfo.getSubjectId() != null){
+            queryInfo.setSubjectIds(queryInfo.getSubjectId().toString());
+        }
         this.initCategoryIds(queryInfo);
 
         PageInfo<SysMusicScore> sysMusicScorePageInfo = queryPage(queryInfo);
@@ -337,6 +343,9 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
     @Override
     public PageInfo<SysMusicScore> queryMusicScorePageInfo(SysExamSongQueryInfo queryInfo) {
         this.initCategoryIds(queryInfo);
+        if(queryInfo.getSubjectId() != null){
+            queryInfo.setSubjectIds(queryInfo.getSubjectId().toString());
+        }
         if(CollectionUtils.isEmpty(queryInfo.getCategoriesIdList())){
             return new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         }
@@ -422,9 +431,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         if (CollectionUtils.isEmpty(musicSheetIds)) {
             return new HashMap<>();
         }
-
         List<SysMusicScore> musicScoreList = sysMusicScoreDao.findByIds(musicSheetIds.stream().map(String::valueOf).collect(Collectors.joining(",")));
-
         if (CollectionUtils.isEmpty(musicScoreList)) {
             return new HashMap<>();
         }

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

@@ -281,6 +281,9 @@
 			<if test="subjectId != null">
 				AND (smsa.subject_id_ = #{subjectId} or smsa.subject_id_ is null)
 			</if>
+			<if test="subjectIds != null and subjectIds != ''">
+				AND FIND_IN_SET(#{subjectIds},ses.subject_ids_)
+			</if>
 			<if test="clientType != null">
 				AND ses.client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>