update

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

@@ -315,4 +315,18 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @return
      */
     List<Map<Integer, Integer>> countQuitNum(@Param("classGroupIds") String classGroupIds);
+
+    /**
+     * 获取乐团详情---课表详情列表
+     * @param params
+     * @return
+     */
+    List<MusicGroupCourseScheduleDto> queryMusicGroupCourseSchedule(Map<String, Object> params);
+
+    /**
+     * COUNT乐团详情---课表详情列表
+     * @param params
+     * @return
+     */
+    int countMusicGroupCourseSchedule(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupCourseScheduleDto.java

@@ -12,4 +12,118 @@ public class MusicGroupCourseScheduleDto {
     @ApiModelProperty(value = "上课时间",required = false)
     private String startClassTime;
 
+    @ApiModelProperty(value = "上课时间",required = false)
+    private String courseScheduleId;
+
+    @ApiModelProperty(value = "上课时间",required = false)
+    private String courseScheduleName;
+
+    @ApiModelProperty(value = "上课时间",required = false)
+    private String classGroupName;
+
+    @ApiModelProperty(value = "上课时间",required = false)
+    private String courseScheduleType;
+
+    @ApiModelProperty(value = "上课时间",required = false)
+    private String getCourseScheduleStatus;
+
+    @ApiModelProperty(value = "上课时间",required = false)
+    private String signInStatus;
+
+    @ApiModelProperty(value = "上课时间",required = false)
+    private String signOutStatus;
+
+    @ApiModelProperty(value = "上课时间",required = false)
+    private String masterTeacherName;
+
+    @ApiModelProperty(value = "上课时间",required = false)
+    private String subTeacherName;
+
+    public String getClassDate() {
+        return classDate;
+    }
+
+    public void setClassDate(String classDate) {
+        this.classDate = classDate;
+    }
+
+    public String getStartClassTime() {
+        return startClassTime;
+    }
+
+    public void setStartClassTime(String startClassTime) {
+        this.startClassTime = startClassTime;
+    }
+
+    public String getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(String courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
+    public String getCourseScheduleName() {
+        return courseScheduleName;
+    }
+
+    public void setCourseScheduleName(String courseScheduleName) {
+        this.courseScheduleName = courseScheduleName;
+    }
+
+    public String getClassGroupName() {
+        return classGroupName;
+    }
+
+    public void setClassGroupName(String classGroupName) {
+        this.classGroupName = classGroupName;
+    }
+
+    public String getCourseScheduleType() {
+        return courseScheduleType;
+    }
+
+    public void setCourseScheduleType(String courseScheduleType) {
+        this.courseScheduleType = courseScheduleType;
+    }
+
+    public String getGetCourseScheduleStatus() {
+        return getCourseScheduleStatus;
+    }
+
+    public void setGetCourseScheduleStatus(String getCourseScheduleStatus) {
+        this.getCourseScheduleStatus = getCourseScheduleStatus;
+    }
+
+    public String getSignInStatus() {
+        return signInStatus;
+    }
+
+    public void setSignInStatus(String signInStatus) {
+        this.signInStatus = signInStatus;
+    }
+
+    public String getSignOutStatus() {
+        return signOutStatus;
+    }
+
+    public void setSignOutStatus(String signOutStatus) {
+        this.signOutStatus = signOutStatus;
+    }
+
+    public String getMasterTeacherName() {
+        return masterTeacherName;
+    }
+
+    public void setMasterTeacherName(String masterTeacherName) {
+        this.masterTeacherName = masterTeacherName;
+    }
+
+    public String getSubTeacherName() {
+        return subTeacherName;
+    }
+
+    public void setSubTeacherName(String subTeacherName) {
+        this.subTeacherName = subTeacherName;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupService.java

@@ -259,5 +259,5 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param queryInfo
      * @return
      */
-    PageInfo queryMusicGroupCourseSchedule(queryMusicGroupCourseScheduleQueryInfo queryInfo);
+    PageInfo<MusicGroupCourseScheduleDto> queryMusicGroupCourseSchedule(queryMusicGroupCourseScheduleQueryInfo queryInfo);
 }

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

@@ -799,7 +799,22 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
-    public PageInfo queryMusicGroupCourseSchedule(queryMusicGroupCourseScheduleQueryInfo queryInfo) {
-        return null;
+    public PageInfo<MusicGroupCourseScheduleDto> queryMusicGroupCourseSchedule(queryMusicGroupCourseScheduleQueryInfo queryInfo) {
+        PageInfo<MusicGroupCourseScheduleDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<>();
+        MapUtil.populateMap(params, queryInfo);
+        List<MusicGroupCourseScheduleDto> dataList = null;
+        int count = classGroupDao.countMusicGroupCourseSchedule(params);
+        CourseSchedule
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = classGroupDao.queryMusicGroupCourseSchedule(params);
+        }
+        if (count == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
     }
 }

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -546,6 +546,7 @@
         WHERE cg.music_group_id_ = #{search} AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX')
         <include refid="global.limit"/>
     </select>
+
     <select id="countMusicGroupClassGroup" resultType="java.lang.Integer">
         SELECT COUNT(cg.id_)
         FROM class_group cg
@@ -564,12 +565,19 @@
         WHERE FIND_IN_SET(sr.class_group_id_,#{classGroupIds}) AND sr.music_group_status_ != 'QUIT'
         GROUP BY sr.class_group_id_
     </select>
+
     <select id="countQuitNum" resultType="java.util.Map">
         SELECT sr.class_group_id_ 'key',COUNT(sr.user_id_) 'value' FROM student_registration sr
         WHERE FIND_IN_SET(sr.class_group_id_,#{classGroupIds}) AND sr.music_group_status_ = 'QUIT'
         GROUP BY sr.class_group_id_
     </select>
 
+    <select id="queryMusicGroupCourseSchedule" resultType="com.ym.mec.biz.dal.dto.MusicGroupCourseScheduleDto">
+
+    </select>
+    <select id="countMusicGroupCourseSchedule" resultType="java.lang.Integer">
+
+    </select>
     <!-- 增加实际学生人数 -->
     <update id="addStudentNum" parameterType="com.ym.mec.biz.dal.entity.ClassGroup">
         UPDATE class_group SET student_num_ = student_num_+1,update_time_=#{updateTime} WHERE id_ = #{id} AND