管乐迷曲目来源内容平台

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

@@ -72,7 +72,7 @@ public class MusicSheetApplicationExtendController {
                         .collect(Collectors.toMap(CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto::getId, o -> o, (o1, o2) -> o1));
             }*/
             List<Long> cbsMusicIds = rows.stream().map(CbsMusicSheetWrapper.MusicSheet::getId).collect(Collectors.toList());
-            List<SysMusicScore> musicSheetList = sysMusicScoreService.getDao().findByCbsId(cbsMusicIds);
+            List<SysMusicScore> musicSheetList = sysMusicScoreService.getDao().findByCbsId(cbsMusicIds,false);
             Map<String, SysMusicScore> map = musicSheetList.stream().collect(Collectors.toMap(SysMusicScore::getCbsMusicSheetId, o -> o, (o1, o2) -> o1));
 
             List<MusicSheetWrapper.MusicSheetApplication> musicSheetApplications = new ArrayList<>();

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysMusicScoreDao.java

@@ -16,7 +16,7 @@ public interface SysMusicScoreDao extends BaseDAO<Integer, SysMusicScore> {
 
     int countBuyCategoriesIds(@Param("categoriesIds") String delCategoriesIds);
 
-    List<SysMusicScore> findByCbsId(@Param("cbsMusicSheetIds") List<Long> cbsMusicSheetIds);
+    List<SysMusicScore> findByCbsId(@Param("cbsMusicSheetIds") List<Long> cbsMusicSheetIds, @Param("delFlag") Boolean delFlag);
 
     void updateBatchByCbsId(@Param("vos") List<CbsMusicSheetApplicationExtendWrapper.MusicSheetApplicationExtend> updateMusicScore);
 

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

@@ -62,7 +62,7 @@ public class CbsMusicSheetServiceImpl implements CbsMusicSheetService {
             }
         }
         //需要修改的曲目
-        List<SysMusicScore> musicSheets = sysMusicScoreService.getDao().findByCbsId(cbsMusicSheetIds);
+        List<SysMusicScore> musicSheets = sysMusicScoreService.getDao().findByCbsId(cbsMusicSheetIds,null);
         if (CollectionUtils.isNotEmpty(musicSheets)){
             List<String> collect = musicSheets.stream().map(SysMusicScore::getCbsMusicSheetId).collect(Collectors.toList());
             //获取需要修改的曲目
@@ -75,7 +75,7 @@ public class CbsMusicSheetServiceImpl implements CbsMusicSheetService {
         if(CollectionUtils.isNotEmpty(addMusicSheet)){
             sysMusicScoreService.getDao().batchInsert(addMusicSheet);
             List<Long> cbsIds = addMusicSheet.stream().map(CbsMusicSheetApplicationExtendWrapper.MusicSheetApplicationExtend::getMusicSheetId).collect(Collectors.toList());
-            List<SysMusicScore> sysMusicScores = sysMusicScoreService.getDao().findByCbsId(cbsIds);
+            List<SysMusicScore> sysMusicScores = sysMusicScoreService.getDao().findByCbsId(cbsIds,false);
             List<Integer> collect = sysMusicScores.stream().map(SysMusicScore::getId).collect(Collectors.toList());
             sysMusicScoreService.getDao().batchInsertAccompaniment(collect);
         }

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

@@ -163,7 +163,10 @@
 		SELECT COUNT(0) FROM sys_music_score WHERE FIND_IN_SET(music_score_categories_id_,#{categoriesIds}) AND del_flag_ = 0
 	</select>
 	<select id="findByCbsId" resultMap="SysMusicScore">
-		SELECT * FROM sys_music_score WHERE del_flag_ = 0
+		SELECT * FROM sys_music_score WHERE 1 = 1
+		<if test="delFlag != null">
+			AND del_flag_ = #{delFlag}
+		</if>
 		<if test="cbsMusicSheetIds != null">
 			AND cbs_music_sheet_id_ IN
 			<foreach collection="cbsMusicSheetIds" separator="," item="item" open="(" close=")">