|
@@ -11,6 +11,7 @@ import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
|
|
|
import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
|
|
|
import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
|
|
|
import com.yonge.cooleshow.biz.dal.enums.album.PurchaseRecordTypeEnum;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.MusicSheetAuthRecordService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
|
|
|
import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
|
|
|
import com.yonge.cooleshow.biz.dal.vo.TeacherAuditMusicSheetVo;
|
|
@@ -43,6 +44,8 @@ public class MusicSheetController extends BaseController {
|
|
|
|
|
|
@Resource
|
|
|
private MusicSheetService musicSheetService;
|
|
|
+ @Resource
|
|
|
+ private MusicSheetAuthRecordService musicSheetAuthRecordService;
|
|
|
|
|
|
/**
|
|
|
* 曲目收藏
|
|
@@ -148,7 +151,9 @@ public class MusicSheetController extends BaseController {
|
|
|
query.setMyself(true);
|
|
|
|
|
|
IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectPage(PageUtil.getPage(query), query);
|
|
|
-
|
|
|
+ if(query.getAuditStatus() != null && !AuthStatusEnum.PASS.getCode().equals(query.getAuditStatus().getCode())){
|
|
|
+ musicSheetAuthRecordService.convertMusicDetail(musicSheetVoIPage,query.getAuditStatus());
|
|
|
+ }
|
|
|
TeacherAuditMusicSheetVo teacherAuditMusicSheetVo = musicSheetService.selectTeacherCount(sysUser.getId());
|
|
|
if (teacherAuditMusicSheetVo == null) {
|
|
|
teacherAuditMusicSheetVo = new TeacherAuditMusicSheetVo();
|