|
@@ -24,6 +24,8 @@ import javax.annotation.Resource;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
+import java.util.Objects;
|
|
|
+import java.util.Optional;
|
|
|
|
|
|
@Service
|
|
|
public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, MusicGroupSubjectPlan> implements MusicGroupSubjectPlanService {
|
|
@@ -146,16 +148,13 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
|
|
|
@Override
|
|
|
public MusicGroupRegRespDto getMusicGroupRegInfo(String musicGroupId) {
|
|
|
MusicGroupRegRespDto musicGroupRegResp = new MusicGroupRegRespDto();
|
|
|
-
|
|
|
- //乐团信息
|
|
|
- MusicGroup musicGroup = musicGroupService.get(musicGroupId);
|
|
|
+ MusicGroup musicGroup = Optional.ofNullable(musicGroupService.get(musicGroupId)).orElseThrow(()->new BizException("乐团信息不存在"));
|
|
|
musicGroupRegResp.setMusicGroupName(musicGroup.getName());
|
|
|
musicGroupRegResp.setCourseViewType(musicGroup.getCourseViewType());
|
|
|
musicGroupRegResp.setMusicGroupStatus(musicGroup.getStatus().getCode());
|
|
|
//声部信息
|
|
|
List<Subject> subjectList = subjectService.findSubByMusicGroupId(musicGroupId);
|
|
|
musicGroupRegResp.setSubjectList(subjectList);
|
|
|
-
|
|
|
return musicGroupRegResp;
|
|
|
}
|
|
|
|