update

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupTrainPlanController.java

@@ -1,12 +1,12 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.biz.dal.entity.MusicGroupTrainPlan;
-import com.ym.mec.biz.dal.entity.MusicGroupTrainPlanSaveDto;
-import com.ym.mec.biz.service.MusicGroupTrainPlanService;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,6 +14,19 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
+import com.ym.mec.biz.dal.dto.Mapper;
+import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.MusicGroupTrainPlan;
+import com.ym.mec.biz.dal.entity.MusicGroupTrainPlanSaveDto;
+import com.ym.mec.biz.dal.entity.Organization;
+import com.ym.mec.biz.dal.enums.GradeTypeEnum;
+import com.ym.mec.biz.service.MusicGroupService;
+import com.ym.mec.biz.service.MusicGroupTrainPlanService;
+import com.ym.mec.biz.service.OrganizationService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
+
 @RequestMapping("musicGroupTrainPlan")
 @Api(tags = "乐团训练规划")
 @RestController
@@ -21,6 +34,15 @@ public class MusicGroupTrainPlanController extends BaseController {
 
 	@Autowired
 	private MusicGroupTrainPlanService musicGroupTrainPlanService;
+	
+	@Autowired
+	private MusicGroupService musicGroupService;
+	
+	@Autowired
+	private OrganizationService organizationService;
+	
+	@Autowired
+	private StudentRegistrationDao studentRegistrationDao;
 
 	@ApiOperation("新增乐团训练规划")
 	@PostMapping(value = "add")
@@ -59,7 +81,26 @@ public class MusicGroupTrainPlanController extends BaseController {
 	@PostMapping(value = "queryExceptionPlan")
 	@PreAuthorize("@pcs.hasPermissions('musicGroupTrainPlan/queryExceptionPlan')")
 	public Object queryExceptionPlan(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
-		return succeed(musicGroupTrainPlanService.queryExceptionPlan(musicGroupTrainPlanSaveDto));
+		Map<String,Object> map = musicGroupTrainPlanService.queryExceptionPlan(musicGroupTrainPlanSaveDto);
+		
+		String musicGroupId = musicGroupTrainPlanSaveDto.getMusicGroupId();
+		MusicGroup musicGroup = musicGroupService.get(musicGroupId);
+		if(musicGroup == null){
+			return failed("乐团信息查询失败");
+		}
+		Map<Object, Object> gradeMap = studentRegistrationDao.countStudentWithGradeByMusicGroupId(musicGroupId).stream().collect(Collectors.toMap(Mapper :: getKey, Mapper :: getValue));
+		
+		Organization organization = organizationService.get(musicGroup.getOrganId());
+		if(organization == null){
+			return failed("分部信息查询失败");
+		}
+		if(organization.getGradeType() == GradeTypeEnum.FIVE_PLUS){
+			map.put("graduateNum", gradeMap.get(5));
+		}else {
+			map.put("graduateNum", gradeMap.get(6));
+		}
+		
+		return succeed(map);
 	}
 
 	@ApiOperation("获取乐团训练规划课时")

mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicGroupRecordController.java

@@ -0,0 +1,74 @@
+package com.ym.mec.web.controller.education;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.biz.dal.dao.ClassGroupDao;
+import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
+import com.ym.mec.biz.dal.dto.MusicGroupBasicDto;
+import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.service.CooperationOrganLinkmanService;
+import com.ym.mec.biz.service.MusicGroupService;
+import com.ym.mec.biz.service.OrganizationService;
+import com.ym.mec.common.controller.BaseController;
+
+@RequestMapping("eduMusicGroupRecord")
+@Api(tags = "乐团档案")
+@RestController
+public class EduMusicGroupRecordController extends BaseController {
+
+	@Autowired
+	private CooperationOrganLinkmanService cooperationOrganLinkmanService;
+	
+	@Autowired
+	private MusicGroupService musicGroupService;
+	
+	@Autowired
+	private OrganizationService organizationService;
+	
+	@Autowired
+	private StudentRegistrationDao studentRegistrationDao;
+	
+	@Autowired
+	private ClassGroupDao classGroupDao;
+
+	@ApiOperation(value = "查询基本信息")
+	@GetMapping("/queryBasicInfo")
+	public Object queryBasicInfo(String musicGroupId) {
+		
+		MusicGroupBasicDto musicGroupBasicDto = musicGroupService.queryBasicInfo(musicGroupId);
+		
+		if(musicGroupBasicDto != null){
+			Integer cooperationOrganId = musicGroupBasicDto.getCooperationOrganId();
+			musicGroupBasicDto.setCooperationOrganLinkmanList(cooperationOrganLinkmanService.queryByCooperationOrganId(cooperationOrganId));
+		}
+		
+		return succeed(musicGroupBasicDto);
+	}
+
+	@ApiOperation(value = "查询学员、师资")
+	@GetMapping("/queryStudentAndTeacher")
+	public Object queryStudentAndTeacher(String musicGroupId) {
+		
+		MusicGroup musicGroup = musicGroupService.get(musicGroupId);
+		if(musicGroup == null){
+			return failed("乐团信息查询失败");
+		}
+		
+		ModelMap model = new ModelMap();
+
+		model.put("subject", studentRegistrationDao.countStudentWithSubjectByMusicGroupId(musicGroupId));
+		
+		model.put("gradeMap", organizationService.getGradeList(musicGroup.getOrganId()));
+		model.put("grade", studentRegistrationDao.countStudentWithGradeByMusicGroupId(musicGroupId));
+		model.put("teacher", classGroupDao.countTeacherByMusicGroupId(musicGroupId));
+		
+		return succeed(model);
+	}
+}