Merge remote-tracking branch 'origin/master'

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

@@ -10,8 +10,8 @@ public class CourseListDto {
     @ApiModelProperty(value = "班级类型", required = true)
     private ClassGroupTypeEnum type;
 
-    @ApiModelProperty(value = "乐团、vip编号",required = true)
-    private String musicGroupId;
+//    @ApiModelProperty(value = "乐团、vip编号",required = true)
+//    private String musicGroupId;
 
     @ApiModelProperty(value = "乐团编号",required = true)
     private String musicId;
@@ -78,6 +78,7 @@ public class CourseListDto {
 
     public void setPracticeId(String practiceId) {
         this.practiceId = practiceId;
+//        this.musicGroupId = practiceId;
     }
 
     public Integer getSurplusClassTimes() {
@@ -94,7 +95,7 @@ public class CourseListDto {
 
     public void setMusicId(String musicId) {
         this.musicId = musicId;
-        this.musicGroupId = musicId;
+//        this.musicGroupId = musicId;
     }
 
     public String getVipId() {
@@ -103,7 +104,7 @@ public class CourseListDto {
 
     public void setVipId(String vipId) {
         this.vipId = vipId;
-        this.musicGroupId = vipId;
+//        this.musicGroupId = vipId;
     }
 
     public Integer getIsApply() {
@@ -186,13 +187,13 @@ public class CourseListDto {
         this.singleClassMinutes = singleClassMinutes;
     }
 
-    public String getMusicGroupId() {
-        return musicGroupId;
-    }
-
-    public void setMusicGroupId(String musicGroupId) {
-        this.musicGroupId = musicGroupId;
-    }
+//    public String getMusicGroupId() {
+//        return musicGroupId;
+//    }
+//
+//    public void setMusicGroupId(String musicGroupId) {
+//        this.musicGroupId = musicGroupId;
+//    }
 
     public String getStudentNames() {
         return studentNames;

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

@@ -573,14 +573,14 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //获取学员所购买的vip课列表详情
         List<CourseListDto> vipCourses = classGroupDao.queryStudentVipCourses(StringUtils.join(musicGroupIds, ","), userId);
         //获取vip课的学生列表
-        Set<String> vipIds = vipCourses.stream().map(CourseListDto::getMusicGroupId).collect(Collectors.toSet());
+        Set<String> vipIds = vipCourses.stream().map(CourseListDto::getVipId).collect(Collectors.toSet());
         Map<String, String> vipStuNames = MapUtil.convertIntegerMap(classGroupDao.findVipStuNames(StringUtils.join(vipIds, ",")));
         //获取学员的乐团列表详情
         List<CourseListDto> musicCourse = classGroupDao.queryStudentMusicGroupCourses(StringUtils.join(musicGroupIds, ","), userId);
         //获取学员购买的陪练课列表
         List<CourseListDto> practiceCourse = classGroupDao.queryStudentPracticeCourses(StringUtils.join(musicGroupIds, ","));
 
-        Set<String> musicGroupId = musicCourse.stream().map(e -> e.getMusicGroupId()).collect(Collectors.toSet());
+        Set<String> musicGroupId = musicCourse.stream().map(e -> e.getMusicId()).collect(Collectors.toSet());
         Set<String> vipGroupId = vipCourses.stream().map(e -> e.getVipId()).collect(Collectors.toSet());
         Set<String> practiceGroupId = practiceCourse.stream().map(e -> e.getPracticeId()).collect(Collectors.toSet());
 
@@ -623,9 +623,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             e.setSurplusClassTimes(classTimes == null?0:classTimes.intValue());
 
             e.setAddress(schoolNames.get(e.getTeacherSchoolId()));
-            e.setIsApply(isApplyMap.get(e.getMusicGroupId()));
+            e.setIsApply(isApplyMap.get(e.getMusicId()));
             if (ClassGroupTypeEnum.VIP == e.getType()) {
-                e.setStudentNames(vipStuNames.get(e.getMusicGroupId()));
+                e.setStudentNames(vipStuNames.get(e.getVipId()));
                 if (e.getOffLineClassesNum() > 0 && e.getOffLineClassesNum() <= 0) {
                     e.setClassMode(1);
                 } else if (e.getOffLineClassesNum() > 0 && e.getOffLineClassesNum() > 0) {