Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -254,6 +254,18 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
     List<CourseSchedule> findGroupNotStartCourses(@Param("groupId") String groupId,
                                                   @Param("groupType") GroupType groupType);
 
+
+    /**
+     * @describe 获取团体下未结束的课程
+     * @author Joburgess
+     * @date 2020/3/4
+     * @param groupId:
+     * @param groupType:
+     * @return java.util.List<com.ym.mec.biz.dal.entity.CourseSchedule>
+     */
+    List<CourseSchedule> findGroupNotFinishCourses(@Param("groupId") String groupId,
+                                                  @Param("groupType") GroupType groupType);
+
     /**
      * @describe 获取团体下未结束的课程
      * @author Joburgess

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

@@ -358,7 +358,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
         result.put("introduction", teacher.getIntroduction());
         result.put("lectureNum", courseScheduleTeacherSalaryDao.countTeacherGiveLesson(coursesGroup.getTeacherId()));
         result.put("subjectNames", StringUtils.join(subjectNames,","));
-        List<CourseSchedule> groupNotStartCourses = courseScheduleDao.findGroupNotStartCourses(groupId.toString(), GroupType.COMM);
+        List<CourseSchedule> groupNotStartCourses = courseScheduleDao.findGroupNotFinishCourses(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());