| 
					
				 | 
			
			
				@@ -730,10 +730,10 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			twoChild.add(new IndexErrInfoDto(IndexErrorType.STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP, IndexErrorType.STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP.getMsg(), quitGroupNum.size(),  quitGroupNum)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			//学员已排课时长未消耗完 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			Map<String, Object> params = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			params.put("organId", organIdsStr); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			params.put("tenantId", tenantId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			twoChild.add(new IndexErrInfoDto(IndexErrorType.HAS_FREE_COURSE_TIMES, IndexErrorType.HAS_FREE_COURSE_TIMES.getMsg(), musicGroupDao.countHasFreeCourseTimes(params), null)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//			Map<String, Object> params = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//			params.put("organId", organIdsStr); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//			params.put("tenantId", tenantId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//			twoChild.add(new IndexErrInfoDto(IndexErrorType.HAS_FREE_COURSE_TIMES, IndexErrorType.HAS_FREE_COURSE_TIMES.getMsg(), musicGroupDao.countHasFreeCourseTimes(params), null)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			//合作单位回款异常 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			Map<String, Object> params1 = new HashMap<>(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1118,13 +1118,13 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		result.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW, IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW.getMsg(),lowTeacherSalary, null)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		//乐团展演计划提醒 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		List<MusicGroupPerformance> musicGroupPerformances = musicGroupPerformanceDao.findNoStart(educationUserId,organIds); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		IndexErrInfoDto infoDto1 = new IndexErrInfoDto(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		infoDto1.setErrorType(IndexErrorType.MUSIC_GROUP_PERFORMANCE); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		infoDto1.setNum(musicGroupPerformances.stream().map(e -> e.getMusicGroupId()).collect(Collectors.toSet()).size()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		infoDto1.setNum2(musicGroupPerformances.stream().map(e -> e.getId()).collect(Collectors.toSet()).size()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		infoDto1.setDesc(IndexErrorType.MUSIC_GROUP_PERFORMANCE.getMsg()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		result.add(infoDto1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		List<MusicGroupPerformance> musicGroupPerformances = musicGroupPerformanceDao.findNoStart(educationUserId,organIds); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		IndexErrInfoDto infoDto1 = new IndexErrInfoDto(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		infoDto1.setErrorType(IndexErrorType.MUSIC_GROUP_PERFORMANCE); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		infoDto1.setNum(musicGroupPerformances.stream().map(e -> e.getMusicGroupId()).collect(Collectors.toSet()).size()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		infoDto1.setNum2(musicGroupPerformances.stream().map(e -> e.getId()).collect(Collectors.toSet()).size()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		infoDto1.setDesc(IndexErrorType.MUSIC_GROUP_PERFORMANCE.getMsg()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		result.add(infoDto1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		//乐团剩余时长未排课 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		List<String> musicGroupIds = musicGroupDao.queryHasSubCourseTimes(organIds,tenantId); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1222,15 +1222,15 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				flag2 = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		if(!flag2){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			Map<String, Object> params = new HashMap<String, Object>(2); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			params.put("organId",organIdsStr); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			params.put("tenantId",tenantId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			Integer hasFreeCourseTimes = musicGroupDao.countHasFreeCourseTimes(params); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			if(hasFreeCourseTimes != null && hasFreeCourseTimes > 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				flag2 = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		if(!flag2){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//			Map<String, Object> params = new HashMap<String, Object>(2); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//			params.put("organId",organIdsStr); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//			params.put("tenantId",tenantId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//			Integer hasFreeCourseTimes = musicGroupDao.countHasFreeCourseTimes(params); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//			if(hasFreeCourseTimes != null && hasFreeCourseTimes > 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//				flag2 = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//			} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		resultMap.put("studentInfo",flag2); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		boolean flag3 = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |