|
@@ -8,6 +8,7 @@ import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import io.swagger.annotations.ApiParam;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
|
|
|
import javax.validation.Valid;
|
|
@@ -328,14 +329,21 @@ public class MusicSheetController extends BaseController {
|
|
|
query.setMusicSortType(MusicSortType.TOP);
|
|
|
appMusicSheetVo.setTopMusicSheet(musicSheetService.selectStudentPage(PageUtil.getPage(query), query, ClientEnum.TEACHER).getRecords());
|
|
|
|
|
|
- // 最热曲目
|
|
|
- query.setMusicSortType(MusicSortType.HOT);
|
|
|
- appMusicSheetVo.setHotMusicSheet(musicSheetService.selectStudentPage(PageUtil.getPage(query), query, ClientEnum.TEACHER).getRecords());
|
|
|
-
|
|
|
-
|
|
|
- // 最新曲目
|
|
|
- query.setMusicSortType(MusicSortType.NEW);
|
|
|
- appMusicSheetVo.setNewMusicSheet(musicSheetService.selectStudentPage(PageUtil.getPage(query), query, ClientEnum.TEACHER).getRecords());
|
|
|
+ // 审核版本只返回一列
|
|
|
+ if (query.getAuditVersion().equals(YesOrNoEnum.YES)) {
|
|
|
+ appMusicSheetVo.setHotMusicSheet(new ArrayList<>());
|
|
|
+ appMusicSheetVo.setNewMusicSheet(new ArrayList<>());
|
|
|
+ } else {
|
|
|
+ // 最热曲目
|
|
|
+ query.setMusicSortType(MusicSortType.HOT);
|
|
|
+ appMusicSheetVo.setHotMusicSheet(
|
|
|
+ musicSheetService.selectStudentPage(PageUtil.getPage(query), query, ClientEnum.STUDENT).getRecords());
|
|
|
+
|
|
|
+ // 最新曲目
|
|
|
+ query.setMusicSortType(MusicSortType.NEW);
|
|
|
+ appMusicSheetVo.setNewMusicSheet(
|
|
|
+ musicSheetService.selectStudentPage(PageUtil.getPage(query), query, ClientEnum.STUDENT).getRecords());
|
|
|
+ }
|
|
|
return succeed(appMusicSheetVo);
|
|
|
}
|
|
|
|