酷乐秀曲目来源改为内容平台

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetController.java

@@ -68,12 +68,12 @@ public class MusicSheetController extends BaseController {
         return R.defaultR();
     }
 
-    @ApiOperation(value = "详情", notes = "曲目表-根据详情ID查询单条, 传入id")
+/*    @ApiOperation(value = "详情", notes = "曲目表-根据详情ID查询单条, 传入id")
     @PreAuthorize("@pcs.hasPermissions('musicSheet/cbsDetail', {'BACKEND'})")
     @GetMapping("musicSheet/cbsDetail/{id}")
     public R<CbsMusicSheetWrapper.MusicSheet> cbsDetail(@PathVariable("id") Long id) {
         return cbsMusicScoreService.musicSheetDetail(id);
-    }
+    }*/
 
     @PostMapping(value = "music/sheet/student")
     @ApiOperation(value = "学生详情-乐谱")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SubjectDao.java

@@ -70,4 +70,6 @@ public interface SubjectDao extends BaseDAO<Long, Subject> {
     List<Subject> getAll();
 
     void updateCbsSubjectIdNull(@Param("subjectId") Long subjectId);
+
+    List<Subject> getByCbsSubjectIds(String subjectIds);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -266,70 +266,6 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         return musicSheets;
     }
 
-    private void musicSheetApplicationToMusicSheet(CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication, MusicSheetVo sheet) {
-        sheet.setMusicSheetName(musicSheetApplication.getName());
-        if (musicSheetApplication.getMusicSheetType() != null) {
-            sheet.setMusicSheetType(MusicSheetTypeEnum.valueOf(musicSheetApplication.getMusicSheetType().name()));
-        }
-        sheet.setTitleImg(musicSheetApplication.getMusicCover());
-        sheet.setUserId(musicSheetApplication.getUserId());
-        if(musicSheetApplication.getSourceType() != null){
-            sheet.setSourceType(musicSheetApplication.getSourceType() == EMusicSourceType.PERSON ? SourceTypeEnum.TEACHER :
-                    musicSheetApplication.getSourceType() == EMusicSourceType.ORG ? SourceTypeEnum.TENANT :SourceTypeEnum.PLATFORM);
-        }
-        sheet.setComposer(musicSheetApplication.getComposer());
-        sheet.setAudioType(AudioTypeEnum.valueOf(musicSheetApplication.getPlayMode().getCode()));
-        sheet.setMp3Type(AudioTypeEnum.valueOf(musicSheetApplication.getIsPlayBeat()&&musicSheetApplication.getIsUseSystemBeat()?"MP3":"MP3_METRONOME"));
-        if (StringUtils.isNotEmpty(musicSheetApplication.getPlaySpeed())) {
-            sheet.setPlaySpeed(musicSheetApplication.getPlaySpeed());
-        }
-        if (musicSheetApplication.getIsConvertibleScore() != null){
-            sheet.setNotation(musicSheetApplication.getIsConvertibleScore()?YesOrNoEnum.YES:YesOrNoEnum.NO);
-        }
-        if (musicSheetApplication.getIsEvaluated() != null){
-            sheet.setCanEvaluate(musicSheetApplication.getIsEvaluated()?YesOrNoEnum.YES:YesOrNoEnum.NO);
-        }
-        if (musicSheetApplication.getIsShowFingering() != null){
-            sheet.setShowFingering(musicSheetApplication.getIsShowFingering()?YesOrNoEnum.YES:YesOrNoEnum.NO);
-        }
-        sheet.setMusicTagNames(musicSheetApplication.getMusicTagNames());
-        sheet.setSubjectNames(musicSheetApplication.getSubjectNames());
-        sheet.setPaymentType(musicSheetApplication.getPaymentType());
-        sheet.setSortNumber(musicSheetApplication.getSortNo());
-        if (musicSheetApplication.getTopFlag() != null){
-            sheet.setTopFlag(musicSheetApplication.getTopFlag()?YesOrNoEnum.YES:YesOrNoEnum.NO);
-        }
-        if (musicSheetApplication.getExquisiteFlag() != null){
-            sheet.setExquisiteFlag(musicSheetApplication.getExquisiteFlag()?YesOrNoEnum.YES:YesOrNoEnum.NO);
-        }
-        sheet.setMusicPrice(musicSheetApplication.getMusicPrice());
-        if (CollectionUtils.isNotEmpty(musicSheetApplication.getMusicSheetAccompanimentList())) {
-            sheet.setAudioFileUrl(musicSheetApplication.getMusicSheetAccompanimentList().get(0).getAudioFileUrl());
-            sheet.setMetronomeUrl(musicSheetApplication.getMusicSheetAccompanimentList().get(0).getAudioFileUrl());
-        }
-        sheet.setXmlFileUrl(musicSheetApplication.getXmlFileUrl());
-        sheet.setMidiUrl(musicSheetApplication.getMidiFileUrl());
-        if (musicSheetApplication.getAppAuditFlag() != null){
-            sheet.setAuditVersion(musicSheetApplication.getAppAuditFlag()?YesOrNoEnum.YES:YesOrNoEnum.NO);
-        }
-        if(musicSheetApplication.getAvailableType() != null){
-            sheet.setProviderType(musicSheetApplication.getAvailableType() == EMusicAvailableType.PERSON ? SourceTypeEnum.TEACHER :
-                    musicSheetApplication.getAvailableType() == EMusicAvailableType.ORG ? SourceTypeEnum.TENANT :SourceTypeEnum.PLATFORM);
-        }
-        sheet.setUpdateBy(musicSheetApplication.getUpdateBy());
-        sheet.setExtConfigJson(musicSheetApplication.getExtConfigJson());
-        sheet.setMusicJSON(musicSheetApplication.getMusicJson());
-        sheet.setMusicSvg(musicSheetApplication.getMusicSvg());
-        sheet.setMusicJianSvg(musicSheetApplication.getMusicJianImg());
-        sheet.setMusicFirstSvg(musicSheetApplication.getMusicFirstImg());
-        if(musicSheetApplication.getMusicSheetType() != null){
-            sheet.setMusicSheetType(musicSheetApplication.getMusicSheetType() == EMusicSheetType.SINGLE ? MusicSheetTypeEnum.SINGLE : MusicSheetTypeEnum.CONCERT);
-        }
-        if(musicSheetApplication.getMusicSheetExtend() != null){
-            sheet.setAddName(musicSheetApplication.getMusicSheetExtend().getUserName());
-        }
-    }
-
     @Override
     public IPage<MusicSheetVo> queryRelatedList(IPage<MusicSheetVo> page, Long albumId, Long musicSheetId) {
 
@@ -541,14 +477,158 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         return detail(id, sysUser, userType,null);
     }
 
-    @Override
-    public MusicSheetDetailVo detail(Long id, SysUser sysUser, ClientEnum userType,String tenantAlbumId) {
-
-        MusicSheetDetailVo detail = baseMapper.detail(id);
-        if (detail == null) {
+    /*public MusicSheetDetailVo getCbsDetail(Long id) {
+        MusicSheetDetailVo musicSheet = baseMapper.detail(id);
+        if (musicSheet == null) {
             throw new BizException("未找到曲目信息");
         }
+        if (musicSheet.getCbsMusicSheetId() == null) {
+            throw new BizException("曲目信息异常");
+        }
+        try {
+            CbsMusicSheetWrapper.MusicSheet musicSheet1 = musicFeignClientService.musicSheetDetail(musicSheet.getCbsMusicSheetId(), Long.parseLong(openFeignClientConfigProperties.getAppId())).feignData();
+            musicSheetApplicationToMusicSheet(musicSheet1, musicSheet);
+        } catch (Exception e) {
+            log.error("调用内容平台服务异常", e);
+            throw com.microsvc.toolkit.common.webportal.exception.BizException.from("内容平台服务异常");
+        }
+        return musicSheet;
+    }*/
+
+    private void musicSheetApplicationToMusicSheet(CbsMusicSheetWrapper.MusicSheet musicSheetApplication, MusicSheetDetailVo sheet) {
+        sheet.setMusicSheetName(musicSheetApplication.getName());
+        if (musicSheetApplication.getMusicSheetType() != null) {
+            sheet.setMusicSheetType(MusicSheetTypeEnum.valueOf(musicSheetApplication.getMusicSheetType().name()));
+        }
+        sheet.setTitleImg(musicSheetApplication.getMusicCover());
+        if(musicSheetApplication.getSourceType() != null){
+            sheet.setSourceType(musicSheetApplication.getSourceType() == EMusicSourceType.PERSON ? SourceTypeEnum.TEACHER :
+                    musicSheetApplication.getSourceType() == EMusicSourceType.ORG ? SourceTypeEnum.TENANT :SourceTypeEnum.PLATFORM);
+        }
+        sheet.setComposer(musicSheetApplication.getComposer());
+        sheet.setAudioType(AudioTypeEnum.valueOf(musicSheetApplication.getPlayMode().getCode()));
+        sheet.setMp3Type(AudioTypeEnum.valueOf(musicSheetApplication.getIsPlayBeat()&&musicSheetApplication.getIsUseSystemBeat()?"MP3":"MP3_METRONOME"));
+        if (StringUtils.isNotEmpty(musicSheetApplication.getPlaySpeed())) {
+            sheet.setPlaySpeed(musicSheetApplication.getPlaySpeed());
+        }
+        if (musicSheetApplication.getIsConvertibleScore() != null){
+            sheet.setNotation(musicSheetApplication.getIsConvertibleScore()?YesOrNoEnum.YES:YesOrNoEnum.NO);
+        }
+        if (musicSheetApplication.getIsEvaluated() != null){
+            sheet.setCanEvaluate(musicSheetApplication.getIsEvaluated()?YesOrNoEnum.YES:YesOrNoEnum.NO);
+        }
+        if (musicSheetApplication.getIsShowFingering() != null){
+            sheet.setShowFingering(musicSheetApplication.getIsShowFingering()?YesOrNoEnum.YES:YesOrNoEnum.NO);
+        }
+        if (musicSheetApplication.getAudioType() != null) {
+            sheet.setAccompanimentType(AccompanimentTypeEnum.valueOf(musicSheetApplication.getAudioType().getCode()));
+        }
+        sheet.setMusicTagNames(musicSheetApplication.getMusicTagNames());
+        sheet.setSubjectNames(musicSheetApplication.getSubjectNames());
+        if (CollectionUtils.isNotEmpty(musicSheetApplication.getMusicSheetAccompanimentList())) {
+            CbsMusicSheetWrapper.MusicSheetAccompaniment accompaniment = musicSheetApplication.getMusicSheetAccompanimentList().get(0);
+            sheet.setAudioFileUrl(accompaniment.getAudioFileUrl());
+            sheet.setMetronomeUrl(accompaniment.getAudioFileUrl());
+            sheet.setUrl(accompaniment.getAudioFileUrl());
+        }
+        sheet.setXmlFileUrl(musicSheetApplication.getXmlFileUrl());
+        sheet.setMidiUrl(musicSheetApplication.getMidiFileUrl());
+        if (musicSheetApplication.getAppAuditFlag() != null){
+            sheet.setAuditVersion(musicSheetApplication.getAppAuditFlag()?YesOrNoEnum.YES:YesOrNoEnum.NO);
+        }
+        if(musicSheetApplication.getAvailableType() != null){
+            sheet.setProviderType(musicSheetApplication.getAvailableType() == EMusicAvailableType.PERSON ? SourceTypeEnum.TEACHER :
+                    musicSheetApplication.getAvailableType() == EMusicAvailableType.ORG ? SourceTypeEnum.TENANT :SourceTypeEnum.PLATFORM);
+        }
+        sheet.setUpdateBy(musicSheetApplication.getUpdateBy());
+        sheet.setExtConfigJson(musicSheetApplication.getExtConfigJson());
+        sheet.setMusicJSON(musicSheetApplication.getMusicJson());
+        sheet.setMusicSvg(musicSheetApplication.getMusicSvg());
+        sheet.setMusicJianSvg(musicSheetApplication.getMusicJianImg());
+        sheet.setMusicFirstSvg(musicSheetApplication.getMusicFirstImg());
+        if(musicSheetApplication.getMusicSheetType() != null){
+            sheet.setMusicSheetType(musicSheetApplication.getMusicSheetType() == EMusicSheetType.SINGLE ? MusicSheetTypeEnum.SINGLE : MusicSheetTypeEnum.CONCERT);
+        }
+        sheet.setBackground(musicSheetApplication.getMusicSheetSoundList().stream().map(musicSheetSound -> {
+            MusicSheetAccompaniment accompaniment = new MusicSheetAccompaniment();
+            accompaniment.setAudioFileUrl(musicSheetSound.getAudioFileUrl());
+            accompaniment.setSortNumber(musicSheetSound.getSortNumber());
+            accompaniment.setTrack(musicSheetSound.getTrack());
+            return accompaniment;
+        }).collect(Collectors.toList()));
+    }
+
+    private void musicSheetApplicationToMusicSheet(CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication, MusicSheetVo sheet) {
+        sheet.setMusicSheetName(musicSheetApplication.getName());
+        if (musicSheetApplication.getMusicSheetType() != null) {
+            sheet.setMusicSheetType(MusicSheetTypeEnum.valueOf(musicSheetApplication.getMusicSheetType().name()));
+        }
+        sheet.setTitleImg(musicSheetApplication.getMusicCover());
+        sheet.setUserId(musicSheetApplication.getUserId());
+        if(musicSheetApplication.getSourceType() != null){
+            sheet.setSourceType(musicSheetApplication.getSourceType() == EMusicSourceType.PERSON ? SourceTypeEnum.TEACHER :
+                    musicSheetApplication.getSourceType() == EMusicSourceType.ORG ? SourceTypeEnum.TENANT :SourceTypeEnum.PLATFORM);
+        }
+        sheet.setComposer(musicSheetApplication.getComposer());
+        sheet.setAudioType(AudioTypeEnum.valueOf(musicSheetApplication.getPlayMode().getCode()));
+        sheet.setMp3Type(AudioTypeEnum.valueOf(musicSheetApplication.getIsPlayBeat()&&musicSheetApplication.getIsUseSystemBeat()?"MP3":"MP3_METRONOME"));
+        if (StringUtils.isNotEmpty(musicSheetApplication.getPlaySpeed())) {
+            sheet.setPlaySpeed(musicSheetApplication.getPlaySpeed());
+        }
+        if (musicSheetApplication.getIsConvertibleScore() != null){
+            sheet.setNotation(musicSheetApplication.getIsConvertibleScore()?YesOrNoEnum.YES:YesOrNoEnum.NO);
+        }
+        if (musicSheetApplication.getIsEvaluated() != null){
+            sheet.setCanEvaluate(musicSheetApplication.getIsEvaluated()?YesOrNoEnum.YES:YesOrNoEnum.NO);
+        }
+        if (musicSheetApplication.getIsShowFingering() != null){
+            sheet.setShowFingering(musicSheetApplication.getIsShowFingering()?YesOrNoEnum.YES:YesOrNoEnum.NO);
+        }
+        if (musicSheetApplication.getAudioType() != null) {
+            sheet.setAccompanimentType(AccompanimentTypeEnum.valueOf(musicSheetApplication.getAudioType().getCode()));
+        }
+        sheet.setMusicTagNames(musicSheetApplication.getMusicTagNames());
+        sheet.setSubjectNames(musicSheetApplication.getSubjectNames());
+        sheet.setPaymentType(musicSheetApplication.getPaymentType());
+        sheet.setSortNumber(musicSheetApplication.getSortNo());
+        if (musicSheetApplication.getTopFlag() != null){
+            sheet.setTopFlag(musicSheetApplication.getTopFlag()?YesOrNoEnum.YES:YesOrNoEnum.NO);
+        }
+        if (musicSheetApplication.getExquisiteFlag() != null){
+            sheet.setExquisiteFlag(musicSheetApplication.getExquisiteFlag()?YesOrNoEnum.YES:YesOrNoEnum.NO);
+        }
+        sheet.setMusicPrice(musicSheetApplication.getMusicPrice());
+        if (CollectionUtils.isNotEmpty(musicSheetApplication.getMusicSheetAccompanimentList())) {
+            sheet.setAudioFileUrl(musicSheetApplication.getMusicSheetAccompanimentList().get(0).getAudioFileUrl());
+            sheet.setMetronomeUrl(musicSheetApplication.getMusicSheetAccompanimentList().get(0).getAudioFileUrl());
+        }
+        sheet.setXmlFileUrl(musicSheetApplication.getXmlFileUrl());
+        sheet.setMidiUrl(musicSheetApplication.getMidiFileUrl());
+        if (musicSheetApplication.getAppAuditFlag() != null){
+            sheet.setAuditVersion(musicSheetApplication.getAppAuditFlag()?YesOrNoEnum.YES:YesOrNoEnum.NO);
+        }
+        if(musicSheetApplication.getAvailableType() != null){
+            sheet.setProviderType(musicSheetApplication.getAvailableType() == EMusicAvailableType.PERSON ? SourceTypeEnum.TEACHER :
+                    musicSheetApplication.getAvailableType() == EMusicAvailableType.ORG ? SourceTypeEnum.TENANT :SourceTypeEnum.PLATFORM);
+        }
+        sheet.setUpdateBy(musicSheetApplication.getUpdateBy());
+        sheet.setExtConfigJson(musicSheetApplication.getExtConfigJson());
+        sheet.setMusicJSON(musicSheetApplication.getMusicJson());
+        sheet.setMusicSvg(musicSheetApplication.getMusicSvg());
+        sheet.setMusicJianSvg(musicSheetApplication.getMusicJianImg());
+        sheet.setMusicFirstSvg(musicSheetApplication.getMusicFirstImg());
+        if(musicSheetApplication.getMusicSheetType() != null){
+            sheet.setMusicSheetType(musicSheetApplication.getMusicSheetType() == EMusicSheetType.SINGLE ? MusicSheetTypeEnum.SINGLE : MusicSheetTypeEnum.CONCERT);
+        }
+        if(musicSheetApplication.getMusicSheetExtend() != null){
+            sheet.setAddName(musicSheetApplication.getMusicSheetExtend().getUserName());
+        }
+    }
+
+    @Override
+    public MusicSheetDetailVo detail(Long id, SysUser sysUser, ClientEnum userType,String tenantAlbumId) {
 
+        MusicSheetDetailVo detail = this.getCbsDetail(id);
         // 设置收藏人数
         detail.setFavoriteCount(detail.getFavoriteCount() + detail.getVirtualNumber());
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MusicSheetDetailVo.java

@@ -5,6 +5,7 @@ import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
 import com.yonge.cooleshow.biz.dal.enums.OrderStatusEnum;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.Date;
 import java.util.List;
@@ -15,6 +16,7 @@ import java.util.List;
  * @author liujunchi
  * @date 2022-04-01
  */
+@Data
 public class MusicSheetDetailVo extends MusicSheet {
 
     @ApiModelProperty("曲谱伴奏")
@@ -74,157 +76,5 @@ public class MusicSheetDetailVo extends MusicSheet {
 
     @ApiModelProperty("课件id")
     private Long coursewareId;
-
-    public YesOrNoEnum getCoursewareStatus() {
-        return coursewareStatus;
-    }
-
-    public void setCoursewareStatus(YesOrNoEnum coursewareStatus) {
-        this.coursewareStatus = coursewareStatus;
-    }
-
-    public Long getCoursewareId() {
-        return coursewareId;
-    }
-
-    public void setCoursewareId(Long coursewareId) {
-        this.coursewareId = coursewareId;
-    }
-
-    public YesOrNoEnum getFavorite() {
-        return favorite;
-    }
-
-    public void setFavorite(YesOrNoEnum favorite) {
-        this.favorite = favorite;
-    }
-
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-
-    public Date getAuditTime() {
-        return auditTime;
-    }
-
-    public void setAuditTime(Date auditTime) {
-        this.auditTime = auditTime;
-    }
-
-    public String getAuditName() {
-        return auditName;
-    }
-
-    public void setAuditName(String auditName) {
-        this.auditName = auditName;
-    }
-
-    public String getAuditReason() {
-        return auditReason;
-    }
-
-    public void setAuditReason(String auditReason) {
-        this.auditReason = auditReason;
-    }
-
-    public MusicSheetDetailVo getLastMusicSheet() {
-        return lastMusicSheet;
-    }
-
-    public void setLastMusicSheet(MusicSheetDetailVo lastMusicSheet) {
-        this.lastMusicSheet = lastMusicSheet;
-    }
-
-    public Integer getAiDefaultFrequency() {
-        return aiDefaultFrequency;
-    }
-
-    public void setAiDefaultFrequency(Integer aiDefaultFrequency) {
-        this.aiDefaultFrequency = aiDefaultFrequency;
-    }
-
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    public String getReason() {
-        return reason;
-    }
-
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getUserAvatar() {
-        return userAvatar;
-    }
-
-    public void setUserAvatar(String userAvatar) {
-        this.userAvatar = userAvatar;
-    }
-
-    public String getMusicTagNames() {
-        return musicTagNames;
-    }
-
-    public void setMusicTagNames(String musicTagNames) {
-        this.musicTagNames = musicTagNames;
-    }
-
-    public String getSubjectNames() {
-        return subjectNames;
-    }
-
-    public void setSubjectNames(String subjectNames) {
-        this.subjectNames = subjectNames;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public List<MusicSheetAccompaniment> getBackground() {
-        return background;
-    }
-
-    public void setBackground(List<MusicSheetAccompaniment> background) {
-        this.background = background;
-    }
-
-    public YesOrNoEnum getPlay() {
-        return play;
-    }
-
-    public void setPlay(YesOrNoEnum play) {
-        this.play = play;
-    }
-
-    public OrderStatusEnum getOrderStatus() {
-        return orderStatus;
-    }
-
-    public void setOrderStatus(OrderStatusEnum orderStatus) {
-        this.orderStatus = orderStatus;
-    }
 }
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -328,6 +328,7 @@
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="musicSheetName" jdbcType="VARCHAR" property="musicSheetName"/>
         <result column="userId" jdbcType="BIGINT" property="userId"/>
+        <result column="cbs_music_sheet_id_" jdbcType="BIGINT" property="cbsMusicSheetId"/>
         <result column="composer" jdbcType="VARCHAR" property="composer"/>
         <result column="titleImg" jdbcType="VARCHAR" property="titleImg"/>
         <result column="musicSubject" jdbcType="VARCHAR" property="musicSubject"/>
@@ -838,7 +839,7 @@
             ms.charge_type_ = #{item.paymentType},
             ms.music_price_ = #{item.musicPrice},ms.top_flag_ = #{item.topFlag},
             ms.exquisite_flag_ = #{item.exquisiteFlag},ms.sort_number_ = #{item.sortNo},ms.del_flag_ = 0,
-            ms.state_ = 0,ms.audit_status_ = 'PASS'
+            ms.audit_status_ = 'PASS'
             <if test="item.musicSheetUpdate != null">
                 ,ms.music_sheet_name_ = #{item.musicSheetUpdate.name},
                 ms.music_subject_ = #{item.musicSheetUpdate.subjectIds},

cooleshow-user/user-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -232,6 +232,9 @@
     <select id="getAll" resultMap="Subject">
         SELECT * FROM subject
     </select>
+    <select id="getByCbsSubjectIds" resultMap="Subject">
+        select * from subject where find_in_set(cbs_subject_id_,#{subjectIds})
+    </select>
 
     <update id="updateCbsSubjectIdNull">
         update subject set cbs_subject_id_ = null where id_ = #{subjectId}