|  | @@ -291,16 +291,23 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          CoursesGroup coursesGroup = coursesGroupDao.get(groupId);
 | 
	
		
			
				|  |  |          Teacher teacher = teacherDao.get(coursesGroup.getTeacherId());
 | 
	
		
			
				|  |  | +        List<String> subjectNames = subjectDao.findBySubIds(teacher.getSubjectId());
 | 
	
		
			
				|  |  |          Map<String, Object> result=new HashMap<>();
 | 
	
		
			
				|  |  |          result.put("groupId", groupId);
 | 
	
		
			
				|  |  |          result.put("groupName", coursesGroup.getName());
 | 
	
		
			
				|  |  |          result.put("courseStartDate",coursesGroup.getCoursesStartDate());
 | 
	
		
			
				|  |  |          result.put("courseEndDate", coursesGroup.getCoursesEndDate());
 | 
	
		
			
				|  |  |          result.put("teacherName", teacher.getRealName());
 | 
	
		
			
				|  |  | +        result.put("avatar",teacher.getAvatar());
 | 
	
		
			
				|  |  |          result.put("introduction", teacher.getIntroduction());
 | 
	
		
			
				|  |  |          result.put("lectureNum", teacher.getLectureNum());
 | 
	
		
			
				|  |  | +        result.put("subjectNames", StringUtils.join(subjectNames,","));
 | 
	
		
			
				|  |  |          List<CourseSchedule> groupNotStartCourses = courseScheduleDao.findGroupNotStartCourses(groupId.toString(), GroupType.COMM);
 | 
	
		
			
				|  |  |          result.put("courseSchedules",groupNotStartCourses);
 | 
	
		
			
				|  |  | +        Map<TeachModeEnum, Long> collect = groupNotStartCourses.stream().collect(Collectors.groupingBy(CourseSchedule::getTeachMode, Collectors.counting()));
 | 
	
		
			
				|  |  | +        result.put("totalClassesTimes", groupNotStartCourses.size());
 | 
	
		
			
				|  |  | +        result.put("onlineClassesTimes", Objects.isNull(collect.get(TeachModeEnum.ONLINE))?0:collect.get(TeachModeEnum.ONLINE));
 | 
	
		
			
				|  |  | +        result.put("offlineClassesTimes", Objects.isNull(collect.get(TeachModeEnum.OFFLINE))?0:collect.get(TeachModeEnum.OFFLINE));
 | 
	
		
			
				|  |  |          return result;
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 |