zouxuan 4 gadi atpakaļ
vecāks
revīzija
c1a199d7ad

+ 39 - 1
mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicGroupTrainPlanController.java

@@ -1,8 +1,15 @@
 package com.ym.mec.web.controller.education;
 
+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;
 import io.swagger.annotations.Api;
@@ -13,6 +20,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+import java.util.stream.Collectors;
+
 @RequestMapping("eduMusicGroupTrainPlan")
 @Api(tags = "乐团训练规划")
 @RestController
@@ -21,6 +31,15 @@ public class EduMusicGroupTrainPlanController extends BaseController {
 	@Autowired
 	private MusicGroupTrainPlanService musicGroupTrainPlanService;
 
+	@Autowired
+	private MusicGroupService musicGroupService;
+
+	@Autowired
+	private OrganizationService organizationService;
+
+	@Autowired
+	private StudentRegistrationDao studentRegistrationDao;
+
 	@ApiOperation("新增乐团训练规划")
 	@PostMapping(value = "add")
 	public Object add(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
@@ -53,7 +72,26 @@ public class EduMusicGroupTrainPlanController extends BaseController {
 	@ApiOperation("获取乐团训练规划异常规划")
 	@PostMapping(value = "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("获取乐团训练规划课时")