|
@@ -2,7 +2,9 @@ package com.ym.mec.web.controller;
|
|
|
|
|
|
import com.ym.mec.biz.dal.dto.CloseMusicGroupDto;
|
|
|
import com.ym.mec.biz.dal.dto.MusicGroupRegsDto;
|
|
|
+import com.ym.mec.biz.dal.entity.MusicGroup;
|
|
|
import com.ym.mec.biz.dal.entity.StudentRegistration;
|
|
|
+import com.ym.mec.biz.service.OrganizationService;
|
|
|
import com.ym.mec.common.entity.HttpResponseResult;
|
|
|
|
|
|
import io.swagger.annotations.Api;
|
|
@@ -10,10 +12,7 @@ import io.swagger.annotations.ApiImplicitParam;
|
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Set;
|
|
|
+import java.util.*;
|
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -48,6 +47,8 @@ public class MusicGroupController extends BaseController {
|
|
|
private SysUserFeignService sysUserFeignService;
|
|
|
@Autowired
|
|
|
private EmployeeDao employeeDao;
|
|
|
+ @Autowired
|
|
|
+ private OrganizationService organizationService;
|
|
|
|
|
|
@ApiOperation(value = "修改乐团基本信息")
|
|
|
@PostMapping("/update")
|
|
@@ -321,4 +322,12 @@ public class MusicGroupController extends BaseController {
|
|
|
return musicGroupService.sendParentMeetingNotice(sysUser.getId(), musicGroupId, meetingDate, address) ? succeed() : failed();
|
|
|
}
|
|
|
|
|
|
+ @ApiOperation(value = "获取乐团的年级列表")
|
|
|
+ @GetMapping("/getGradeList")
|
|
|
+ @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
|
|
|
+ public HttpResponseResult<Map<Integer,String>> getGradeList(String musicGroupId) {
|
|
|
+ MusicGroup musicGroup = musicGroupService.get(musicGroupId);
|
|
|
+ return succeed(organizationService.getGradeList(musicGroup.getOrganId()));
|
|
|
+ }
|
|
|
+
|
|
|
}
|