刘俊驰 5 月之前
父节点
当前提交
a941b5c3f9

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

@@ -81,6 +81,8 @@ public class MusicSheetController {
             musicSheetDetail.setPaymentType(StringUtils.isBlank(detail.getRankIds()) ? "FREE" : "VIP");
             // 设置业务端曲目分类
             musicSheetDetail.setBizMusicCategoryId(detail.getCategoriesId() == null ? null : detail.getCategoriesId().longValue());
+            musicSheetDetail.setScoreType(detail.getScoreType());
+            musicSheetDetail.setIsConvertibleScore(detail.getIsConvertibleScore());
         }
 
         // 设置乐器信息
@@ -122,6 +124,8 @@ public class MusicSheetController {
         } else if (StringUtils.isNotBlank(student.getSubjectIdList())){
             queryInfo.setSubjectId(Integer.parseInt(student.getSubjectIdList()));
         }
+        queryInfo.setPage(query.getPage());
+        queryInfo.setRows(query.getRows());
         queryInfo.setName(query.getName());
         queryInfo.setType("COMMON");
         queryInfo.setClientFlag(true);

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

@@ -77,6 +77,8 @@ public class MusicSheetController {
             musicSheetDetail.setPaymentType(StringUtils.isBlank(detail.getRankIds()) ? "FREE" : "VIP");
             // 设置业务端曲目分类
             musicSheetDetail.setBizMusicCategoryId(detail.getCategoriesId() == null ? null : detail.getCategoriesId().longValue());
+            musicSheetDetail.setScoreType(detail.getScoreType());
+            musicSheetDetail.setIsConvertibleScore(detail.getIsConvertibleScore());
         }
 
         // 设置乐器信息
@@ -125,6 +127,9 @@ public class MusicSheetController {
                 queryInfo.setSubjectId(instrument.getSubjectId());
             }
         }
+
+        queryInfo.setPage(query.getPage());
+        queryInfo.setRows(query.getRows());
         queryInfo.setName(query.getName());
         queryInfo.setType("COMMON");
         queryInfo.setClientFlag(true);

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

@@ -71,6 +71,8 @@ public class MusicSheetController {
             musicSheetDetail.setPaymentType(StringUtils.isBlank(detail.getRankIds()) ? "FREE" : "VIP");
             // 设置业务端曲目分类
             musicSheetDetail.setBizMusicCategoryId(detail.getCategoriesId() == null ? null : detail.getCategoriesId().longValue());
+            musicSheetDetail.setScoreType(detail.getScoreType());
+            musicSheetDetail.setIsConvertibleScore(detail.getIsConvertibleScore());
         }
 
         // 设置乐器信息
@@ -109,6 +111,9 @@ public class MusicSheetController {
                 queryInfo.setSubjectId(instrument.getSubjectId());
             }
         }
+
+        queryInfo.setPage(query.getPage());
+        queryInfo.setRows(query.getRows());
         queryInfo.setName(query.getName());
         queryInfo.setRecentFlag(query.getRecentFlag());
         queryInfo.setExcludeMusicId(query.getExcludeMusicId());