|
@@ -433,23 +433,23 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public boolean saveMusicSheet(MusicSheetDto musicSheetDto, Long userId) {
|
|
|
|
|
|
+ MusicSheet oldMusicSheet = getById(musicSheetDto.getId());
|
|
|
// 保存审核拒绝的数据
|
|
|
if (musicSheetDto.getId() != null && AuthStatusEnum.DOING.getCode().equals(musicSheetDto.getAuditStatus().getCode())) {
|
|
|
// 保存删除的曲目
|
|
|
- MusicSheet musicSheet = getById(musicSheetDto.getId());
|
|
|
- if (musicSheet.getAuditStatus().equals(AuthStatusEnum.UNPASS)) {
|
|
|
- musicSheet.setId(null);
|
|
|
- musicSheet.setDelFlag(true);
|
|
|
- this.save(musicSheet);
|
|
|
+ if (oldMusicSheet.getAuditStatus().equals(AuthStatusEnum.UNPASS)) {
|
|
|
+ oldMusicSheet.setId(null);
|
|
|
+ oldMusicSheet.setDelFlag(true);
|
|
|
+ this.save(oldMusicSheet);
|
|
|
// 删除的曲目的伴奏
|
|
|
musicSheetAccompanimentService.lambdaUpdate()
|
|
|
.eq(MusicSheetAccompaniment::getMusicSheetId,musicSheetDto.getId())
|
|
|
- .set(MusicSheetAccompaniment::getMusicSheetId,musicSheet.getId())
|
|
|
+ .set(MusicSheetAccompaniment::getMusicSheetId,oldMusicSheet.getId())
|
|
|
.update();
|
|
|
// 审核拒绝的原因
|
|
|
musicSheetAuthRecordService.lambdaUpdate()
|
|
|
.eq(MusicSheetAuthRecord::getMusicSheetId,musicSheetDto.getId())
|
|
|
- .set(MusicSheetAuthRecord::getMusicSheetId,musicSheet.getId())
|
|
|
+ .set(MusicSheetAuthRecord::getMusicSheetId,oldMusicSheet.getId())
|
|
|
.update();
|
|
|
}
|
|
|
|
|
@@ -464,7 +464,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
|
|
|
}
|
|
|
|
|
|
// 删除曲目专辑关联
|
|
|
- // delAlbumSheetRef(musicSheetDto.getId(), musicSheetDto.getMusicSubject());
|
|
|
+ if (!oldMusicSheet.getMusicSubject().equals(musicSheetDto.getMusicSubject())) {
|
|
|
+ delAlbumSheetRef(musicSheetDto.getId(), musicSheetDto.getMusicSubject());
|
|
|
+ }
|
|
|
|
|
|
List<MusicSheetAccompaniment> list;
|
|
|
if (!AudioTypeEnum.MIDI.getCode().equals(musicSheetDto.getAudioType().getCode())) {
|