| 
					
				 | 
			
			
				@@ -331,8 +331,8 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		saveData(vipCourseData, dayStr, IndexDataType.VIP_GROUP_COURSE); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		List<IndexBaseMonthData> vipOnlineCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, GroupType.VIP, null, null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		List<OrganVipGroupCategoryCourseNumDto> vipGroupOnlineCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(dayStr, GroupType.VIP, null, null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		List<IndexBaseMonthData> vipOnlineCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, GroupType.VIP, null, TeachModeEnum.ONLINE); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		List<OrganVipGroupCategoryCourseNumDto> vipGroupOnlineCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(dayStr, GroupType.VIP, null, TeachModeEnum.ONLINE); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		Map<Integer, Map<String, Integer>> organOnlineCategoryCourseMap = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		if(!CollectionUtils.isEmpty(vipGroupOnlineCategoryCourseData)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			organOnlineCategoryCourseMap = vipGroupOnlineCategoryCourseData.stream().collect(Collectors.groupingBy(OrganVipGroupCategoryCourseNumDto::getOrganId, Collectors.toMap(OrganVipGroupCategoryCourseNumDto::getCategoryName, o -> o.getCourseNum()))); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -345,8 +345,8 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		saveData(vipOnlineCourseData, dayStr, IndexDataType.VIP_GROUP_ONLINE_COURSE); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		List<IndexBaseMonthData> vipOfflineCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, GroupType.VIP, null, null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		List<OrganVipGroupCategoryCourseNumDto> vipGroupOfflineCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(dayStr, GroupType.VIP, null, null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		List<IndexBaseMonthData> vipOfflineCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, GroupType.VIP, null, TeachModeEnum.OFFLINE); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		List<OrganVipGroupCategoryCourseNumDto> vipGroupOfflineCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(dayStr, GroupType.VIP, null, TeachModeEnum.OFFLINE); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		Map<Integer, Map<String, Integer>> organOfflineCategoryCourseMap = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		if(!CollectionUtils.isEmpty(vipGroupOfflineCategoryCourseData)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			organOfflineCategoryCourseMap = vipGroupOfflineCategoryCourseData.stream().collect(Collectors.groupingBy(OrganVipGroupCategoryCourseNumDto::getOrganId, Collectors.toMap(OrganVipGroupCategoryCourseNumDto::getCategoryName, o -> o.getCourseNum()))); 
			 |