Parcourir la source

Merge branch 'feature/0427-school' of http://git.dayaedu.com/yonge/mec into feature/0427-school

liujc il y a 2 ans
Parent
commit
5636c9b4c2

+ 2 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/school/dto/MusicGroupQuitDetailDto.java

@@ -18,4 +18,6 @@ public class MusicGroupQuitDetailDto extends MusicGroupQuitPageDto{
 
     @ApiModelProperty(value = "学员编号",required = true)
     private MusicGroupQuit.ReasonEnum reasonEnum;
+
+    private String musicGroupName;
 }

+ 1 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupQuitServiceImpl.java

@@ -97,6 +97,7 @@ public class MusicGroupQuitServiceImpl extends BaseServiceImpl<Long, MusicGroupQ
 		detailDto.setCreateTime(musicGroupQuit.getCreateTime());
 		detailDto.setSubjectName(subject.getName());
 		detailDto.setStatus(musicGroupQuit.getSchoolStaffAuditStatus());
+		detailDto.setMusicGroupName(musicGroupDao.get(musicGroupQuit.getMusicGroupId()).getName());
 		return detailDto;
     }