Merge branch 'feature/1015-cbs-music' into dev

mec-application/src/main/java/com/ym/mec/student/controller/MusicSheetController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.microsvc.toolkit.common.response.template.R;
 import com.ym.mec.biz.dal.entity.Instrument;
+import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.enums.ClientEnum;
@@ -12,6 +13,7 @@ import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.dal.wrapper.InstrumentWrapper;
 import com.ym.mec.biz.dal.wrapper.MusicSheetWrapper;
 import com.ym.mec.biz.service.InstrumentService;
+import com.ym.mec.biz.service.StudentService;
 import com.ym.mec.biz.service.SysMusicScoreService;
 import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.common.exception.BizException;
@@ -51,6 +53,10 @@ public class MusicSheetController {
 
     @Resource
     private SysUserService sysUserService;
+
+    @Autowired
+    private StudentService studentService;
+
     /**
      * 查询单条
      *
@@ -103,6 +109,7 @@ public class MusicSheetController {
         SysExamSongQueryInfo queryInfo = new SysExamSongQueryInfo();
 
         Integer userId = sysUserService.getUserId();
+        Student student = studentService.get(userId);
         if(query.getMusicSheetCategoriesId() != null) {
             queryInfo.setCategoriesId(query.getMusicSheetCategoriesId().toString());
         }
@@ -112,13 +119,16 @@ public class MusicSheetController {
             if (instrument != null) {
                 queryInfo.setSubjectId(instrument.getSubjectId());
             }
+        } else if (StringUtils.isNotBlank(student.getSubjectIdList())){
+            queryInfo.setSubjectId(Integer.parseInt(student.getSubjectIdList()));
         }
+        queryInfo.setName(query.getName());
         queryInfo.setType("COMMON");
         queryInfo.setClientFlag(true);
         queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
-
+        queryInfo.setRecentFlag(query.getRecentFlag());
         queryInfo.setUserId(userId);
-        queryInfo.setClientId(ClientEnum.TEACHER.getCode().toLowerCase());
+        queryInfo.setClientId(ClientEnum.STUDENT.getCode().toLowerCase());
         PageInfo<SysMusicScore> sysMusicScorePageInfo1 = musicSheetService.queryMusicScorePageInfo(queryInfo);
         PageInfo<MusicSheetWrapper.MusicSheet> convert = sysMusicScorePageInfo1.convert(o -> {
             MusicSheetWrapper.MusicSheet musicSheet = new MusicSheetWrapper.MusicSheet();

mec-application/src/main/java/com/ym/mec/teacher/controller/MusicSheetController.java

@@ -125,10 +125,12 @@ public class MusicSheetController {
                 queryInfo.setSubjectId(instrument.getSubjectId());
             }
         }
+        queryInfo.setName(query.getName());
         queryInfo.setType("COMMON");
         queryInfo.setClientFlag(true);
         queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
         queryInfo.setUserId(userId);
+        queryInfo.setRecentFlag(query.getRecentFlag());
         queryInfo.setClientId(ClientEnum.TEACHER.getCode().toLowerCase());
         PageInfo<SysMusicScore> sysMusicScorePageInfo1 = musicSheetService.queryMusicScorePageInfo(queryInfo);
         PageInfo<MusicSheetWrapper.MusicSheet> convert = sysMusicScorePageInfo1.convert(o -> {

mec-application/src/main/java/com/ym/mec/web/controller/MusicSheetController.java

@@ -109,12 +109,14 @@ public class MusicSheetController {
                 queryInfo.setSubjectId(instrument.getSubjectId());
             }
         }
+        queryInfo.setName(query.getName());
         queryInfo.setRecentFlag(query.getRecentFlag());
         queryInfo.setExcludeMusicId(query.getExcludeMusicId());
         queryInfo.setType("COMMON");
         queryInfo.setClientFlag(true);
         queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
         queryInfo.setUserId(userId);
+        queryInfo.setRecentFlag(query.getRecentFlag());
         queryInfo.setClientId("education");
         PageInfo<SysMusicScore> sysMusicScorePageInfo = musicSheetService.queryMusicScorePage(queryInfo);
         PageInfo<MusicSheetWrapper.MusicSheet> convert = sysMusicScorePageInfo.convert(o -> {

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

@@ -70,4 +70,7 @@ public class SysExamSongQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "用户类型",hidden = true)
     private String clientId;
+
+    @ApiModelProperty("仅匹配资源名称")
+    private String name;
 }

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

@@ -276,6 +276,9 @@
 			<if test="search != null and search != ''">
 				AND (ses.cbs_music_sheet_id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
 			</if>
+            <if test="name != null and name != ''">
+                AND ses.name_ LIKE CONCAT('%',#{name},'%')
+            </if>
 			<if test="showFlag != null">
 				AND ses.show_flag_ = #{showFlag}
 			</if>