乐团档案

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupTrainPlanService.java

@@ -17,4 +17,6 @@ public interface MusicGroupTrainPlanService extends BaseService<Integer, MusicGr
     List<ClassGroup> queryPlanCourseNum(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto);
 
     List<String> queryCourseType(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto);
+
+    Map<String,Object> queryExceptionPlan(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupTrainPlanServiceImpl.java

@@ -98,7 +98,19 @@ public class MusicGroupTrainPlanServiceImpl extends BaseServiceImpl<Integer, Mus
 		return courseScheduleDao.queryCourseTypeByClassGroupIds(musicGroupTrainPlanSaveDto);
     }
 
-    private MusicGroupTrainPlanSaveDto getCourseDetail(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto){
+	@Override
+	public Map<String, Object> queryExceptionPlan(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
+		getCourseDetail(musicGroupTrainPlanSaveDto);
+		Map<String,Object> resultMap = new HashMap<>(2);
+		//获取乐团当前学期每个班级不同课程类型数量
+		List<WaitCourseTrainPlanDto> waitCourseTrainPlanDtos = musicGroupTrainPlanDao.queryWaitCourseTrainPlan(musicGroupTrainPlanSaveDto.getMusicGroupId());
+		resultMap.put("waitCourseTrainPlanDtos",waitCourseTrainPlanDtos);
+		List<WaitCourseTrainPlanDto> queryWaitCourseTrainPlan1 = musicGroupTrainPlanDao.queryWaitCourseTrainPlan1(musicGroupTrainPlanSaveDto.getMusicGroupId());
+		resultMap.put("waitCourseTrainPlanDtos1",queryWaitCourseTrainPlan1);
+		return resultMap;
+	}
+
+	private MusicGroupTrainPlanSaveDto getCourseDetail(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto){
 		String year = musicGroupTrainPlanSaveDto.getYear();
 		if(musicGroupTrainPlanSaveDto.getTerm() == 0){
 			musicGroupTrainPlanSaveDto.setStartSchoolTerm(DateUtil.stringToDate(year + "-03-01 00:00:00"));

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

@@ -48,6 +48,13 @@ public class MusicGroupTrainPlanController extends BaseController {
 		return succeed(musicGroupTrainPlanService.queryPlanPage(musicGroupTrainPlanSaveDto));
 	}
 
+	@ApiOperation("获取乐团训练规划异常规划")
+	@PostMapping(value = "queryExceptionPlan")
+	@PreAuthorize("@pcs.hasPermissions('musicGroupTrainPlan/queryExceptionPlan')")
+	public Object queryExceptionPlan(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
+		return succeed(musicGroupTrainPlanService.queryExceptionPlan(musicGroupTrainPlanSaveDto));
+	}
+
 	@ApiOperation("获取乐团训练规划课时")
 	@PostMapping(value = "queryPlanCourseNum")
 	@PreAuthorize("@pcs.hasPermissions('musicGroupTrainPlan/queryPlanCourseNum')")