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

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

@@ -146,6 +146,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     @Resource
     private TenantAlbumMusicMapper tenantAlbumMusicMapper;
     @Resource
+    private MusicSheetAccompanimentService musicSheetAccompanimentService;
+    @Resource
     private MusicFeignClientService musicFeignClientService;
     @Resource
     private OpenFeignClientConfigProperties openFeignClientConfigProperties;
@@ -408,16 +410,19 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         if(musicSheet.getCbsMusicSheetId() == null){
             throw new BizException("曲目信息未同步");
         }
-        R<CbsMusicSheetWrapper.MusicSheet> musicSheetR = cbsMusicScoreService.musicSheetDetail(musicSheet.getCbsMusicSheetId());
-        if(musicSheetR.getCode() != 200){
-            throw new BizException("获取曲目信息失败");
-        }
-        CbsMusicSheetWrapper.MusicSheet musicSheet1 = musicSheetR.getData();
-        if (musicSheet1 == null) {
+        MusicSheetDetailVo detailVo = JSON.parseObject(JSON.toJSONString(musicSheet), MusicSheetDetailVo.class);
+        this.initMusicSheetDetailVo(detailVo,musicSheet);
+        return detailVo;
+    }
+
+    public MusicSheetDetailVo getAuditDetail(Long id) {
+        MusicSheet musicSheet = this.baseMapper.get(id);
+        if (musicSheet == null) {
             throw new BizException("未找到曲目信息");
         }
         MusicSheetDetailVo detailVo = JSON.parseObject(JSON.toJSONString(musicSheet), MusicSheetDetailVo.class);
-        this.initMusicSheetDetailVo(detailVo,musicSheet);
+        List<MusicSheetAccompaniment> list = musicSheetAccompanimentService.lambdaQuery().eq(MusicSheetAccompaniment::getMusicSheetId, id).list();
+        detailVo.setBackground(list);
         return detailVo;
     }
 

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

@@ -5,6 +5,7 @@ import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -15,8 +16,12 @@ import java.util.Date;
  * @author liujunchi
  * @date 2022-04-02
  */
+@Data
 public class TeacherMusicSheetVo {
 
+    @ApiModelProperty("审核id")
+    private Long id;
+
     @ApiModelProperty("曲目审核id")
     private Long authMusicSheetId;
 
@@ -74,155 +79,7 @@ public class TeacherMusicSheetVo {
     @ApiModelProperty("审批人姓名")
     private String auditName;
 
-    public Integer getFirstAuth() {
-        return firstAuth;
-    }
-
-    public void setFirstAuth(Integer firstAuth) {
-        this.firstAuth = firstAuth;
-    }
-
-    public Long getAuthMusicSheetId() {
-        return authMusicSheetId;
-    }
-
-    public void setAuthMusicSheetId(Long authMusicSheetId) {
-        this.authMusicSheetId = authMusicSheetId;
-    }
-
-    public AccompanimentTypeEnum getAccompanimentType() {
-        return accompanimentType;
-    }
-
-    public void setAccompanimentType(AccompanimentTypeEnum accompanimentType) {
-        this.accompanimentType = accompanimentType;
-    }
-
-    public String getTitleImg() {
-        return titleImg;
-    }
-
-    public void setTitleImg(String titleImg) {
-        this.titleImg = titleImg;
-    }
-
-    public Long getTeacherId() {
-        return teacherId;
-    }
-
-    public void setTeacherId(Long teacherId) {
-        this.teacherId = teacherId;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public Long getMusicSheetId() {
-        return musicSheetId;
-    }
-
-    public void setMusicSheetId(Long musicSheetId) {
-        this.musicSheetId = musicSheetId;
-    }
-
-    public String getMusicSheetName() {
-        return musicSheetName;
-    }
-
-    public void setMusicSheetName(String musicSheetName) {
-        this.musicSheetName = musicSheetName;
-    }
-
-    public String getComposer() {
-        return composer;
-    }
-
-    public void setComposer(String composer) {
-        this.composer = composer;
-    }
-
-    public String getMusicTag() {
-        return musicTag;
-    }
-
-    public void setMusicTag(String musicTag) {
-        this.musicTag = musicTag;
-    }
-
-    public String getMusicTagNames() {
-        return musicTagNames;
-    }
-
-    public void setMusicTagNames(String musicTagNames) {
-        this.musicTagNames = musicTagNames;
-    }
-
-    public Integer getPlaySpeed() {
-        return playSpeed;
-    }
-
-    public void setPlaySpeed(Integer playSpeed) {
-        this.playSpeed = playSpeed;
-    }
-
-    public BigDecimal getMusicPrice() {
-        return musicPrice;
-    }
-
-    public void setMusicPrice(BigDecimal musicPrice) {
-        this.musicPrice = musicPrice;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public AuthStatusEnum getAuditStatus() {
-        return auditStatus;
-    }
-
-    public void setAuditStatus(AuthStatusEnum auditStatus) {
-        this.auditStatus = auditStatus;
-    }
-
-    public String getAuditName() {
-        return auditName;
-    }
-
-    public void setAuditName(String auditName) {
-        this.auditName = auditName;
-    }
-
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-
-	public YesOrNoEnum getExquisiteFlag() {
-		return exquisiteFlag;
-	}
+    @ApiModelProperty("批次号")
+    private String batchNo;
 
-	public void setExquisiteFlag(YesOrNoEnum exquisiteFlag) {
-		this.exquisiteFlag = exquisiteFlag;
-	}
 }

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

@@ -46,6 +46,8 @@
         ,if(msar.audit_state_ is null,ms.audit_status_,msar.audit_state_) as auditStatus
         ,su2.username_ as auditName
         ,msar.first_auth_ as firstAuth
+        ,msar.batch_no_ as batchNo
+        ,msar.id_ as id
         from music_sheet_auth_record  msar
         left join  music_sheet ms on ms.id_ = msar.music_sheet_id_
         left join sys_user su on su.id_ = ms.create_by_