Merge remote-tracking branch 'origin/master'

cms/src/main/resources/config/mybatis/HelpCenterContentMapper.xml

@@ -71,7 +71,7 @@
 		<include refid="global.limit" />
 	</select>
 
-	<select id="findCount" parameterType="map" resultType="int">
+	<select id="queryCount" parameterType="map" resultType="int">
 		select count(*) from help_center_content content left join help_center_catalog catalog on
 		content.catalog_id_=catalog.id_
 		<include refid="queryConditionUnion" />

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

@@ -4102,10 +4102,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		//获取最近一次已结束的课程
 		CourseSchedule courseSchedule = courseScheduleDao.getLastEndCourse(schedule.getMusicGroupId(),schedule.getGroupType().getCode());
 		//标记当前课程的上一节课
-		for (CourseScheduleRateDto e:courseScheduleRateDtos) {
-			if(e.getCourseScheduleId().equals(courseSchedule.getId())){
-				e.setIsDefault(true);
-				break;
+		if(courseSchedule != null){
+			for (CourseScheduleRateDto e:courseScheduleRateDtos) {
+				if(e.getCourseScheduleId().equals(courseSchedule.getId())){
+					e.setIsDefault(true);
+					break;
+				}
 			}
 		}
 		return courseScheduleRateDtos;

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

@@ -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;
     }