|
@@ -354,7 +354,8 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
|
|
//获取待审核曲目信息
|
|
//获取待审核曲目信息
|
|
MusicSheetAuthRecord record = this.lambdaQuery().eq(MusicSheetAuthRecord::getId, id).one();
|
|
MusicSheetAuthRecord record = this.lambdaQuery().eq(MusicSheetAuthRecord::getId, id).one();
|
|
if(Objects.isNull(record)){
|
|
if(Objects.isNull(record)){
|
|
- record = this.lambdaQuery().eq(MusicSheetAuthRecord::getMusicSheetId, id).last("LIMIT 1").one();
|
|
|
|
|
|
+ record = this.lambdaQuery().eq(MusicSheetAuthRecord::getMusicSheetId, id)
|
|
|
|
+ .orderByDesc(MusicSheetAuthRecord::getId).last("LIMIT 1").one();
|
|
}
|
|
}
|
|
if(Objects.nonNull(record)){
|
|
if(Objects.nonNull(record)){
|
|
MusicSheetDetailVo sheetDetailVo = musicSheetService.getDao().auditDetail(record.getId());
|
|
MusicSheetDetailVo sheetDetailVo = musicSheetService.getDao().auditDetail(record.getId());
|
|
@@ -392,7 +393,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
|
|
collect.stream().collect(Collectors.groupingBy(TeacherMusicSheetVo::getAuditStatus));
|
|
collect.stream().collect(Collectors.groupingBy(TeacherMusicSheetVo::getAuditStatus));
|
|
for (AuthStatusEnum authStatusEnum : statusEnumListMap.keySet()) {
|
|
for (AuthStatusEnum authStatusEnum : statusEnumListMap.keySet()) {
|
|
List<TeacherMusicSheetVo> records = statusEnumListMap.get(authStatusEnum);
|
|
List<TeacherMusicSheetVo> records = statusEnumListMap.get(authStatusEnum);
|
|
- List<Long> musicSheetIds = records.stream().map(e -> e.getId()).collect(Collectors.toList());
|
|
|
|
|
|
+ List<Long> musicSheetIds = records.stream().map(e -> e.getMusicSheetId()).collect(Collectors.toList());
|
|
List<MusicSheetAuthRecord> recordList = this.baseMapper.findByMusicSheetIds(musicSheetIds, authStatusEnum.getCode());
|
|
List<MusicSheetAuthRecord> recordList = this.baseMapper.findByMusicSheetIds(musicSheetIds, authStatusEnum.getCode());
|
|
if (CollectionUtils.isNotEmpty(recordList)){
|
|
if (CollectionUtils.isNotEmpty(recordList)){
|
|
Map<Long,MusicSheetAuthRecord> authRecordMap = recordList.stream()
|
|
Map<Long,MusicSheetAuthRecord> authRecordMap = recordList.stream()
|