Merge remote-tracking branch 'origin/master'

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

@@ -154,6 +154,7 @@ public interface ClassGroupStudentMapperDao extends BaseDAO<Long, ClassGroupStud
      * @date 2019/10/19
      */
     List<StudentAttendanceViewDto> findStudentByCourseWithPage(Map<String, Object> params);
+
     int countStudentByCourseWithPage(Map<String, Object> params);
 
     /**

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

@@ -3267,11 +3267,18 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     public Map<String, Object> studentClassAuditDetail(String musicGroupId) {
+        List<Map<String,Object>> result = new ArrayList<>();
+        Map<String,Object> resultMap = new HashMap();
         //获取班级列表
         List<ClassGroup> classGroups = classGroupDao.queryClassGroups(musicGroupId, null);
-        //获取班级里学员列表
-
-        //获取班级剩余的课程类型和课程数量
+        for (ClassGroup classGroup : classGroups) {
+            resultMap.put("classGroup",classGroup);
+            //获取班级剩余的课程类型和课程数量
+//            List<Map<String,Integer>> courseTypeNumMap = courseScheduleDao.querySubCourseNumMap(classGroup.getId());
+//            resultMap.put("courseTypeNumMap",courseTypeNumMap);
+            //获取班级里学员列表
+//            classGroupStudentMapperDao.findCourseStudentNameAndPhone()
+        }
 
         return null;
     }