fix

mec-biz/src/main/java/com/ym/mec/biz/dal/page/VipGroupQueryInfo.java

@@ -1,8 +1,11 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Optional;
+
 /**
  * @Author Joburgess
  * @Date 2019/10/9
@@ -28,6 +31,9 @@ public class VipGroupQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "上课时间，年月日",required = false)
     private String classDate;
 
+    @ApiModelProperty(value = "课程类型分组")
+    private String groupType;
+
     public String getClassDate() {
         return classDate;
     }
@@ -99,4 +105,12 @@ public class VipGroupQueryInfo extends QueryInfo {
     public void setOrganId(String organId) {
         this.organId = organId;
     }
+
+    public String getGroupType() {
+        return Optional.ofNullable(groupType).orElse(GroupType.VIP.getCode());
+    }
+
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/VipGroupTeachingRecordQueryInfo.java

@@ -20,10 +20,10 @@ public class VipGroupTeachingRecordQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "结束时间")
     private Date endTime;
 
-    @ApiModelProperty(value = "vip课编号")
+    @ApiModelProperty(value = "vip课教学模式")
     private String teachMode;
 
-    @ApiModelProperty(value = "vip课编号")
+    @ApiModelProperty(value = "vip课状态")
     private String status;
 
     public Long getVipGroupId() {

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

@@ -4400,7 +4400,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         if (vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING)) {
             dataList = JSON.parseArray(vipGroup.getCourseSchedulesJson(), CourseSchedule.class);
         } else {
-            dataList = courseScheduleDao.findGroupCourseSchedules(vipGroup.getId().toString(),GroupType.VIP.getCode());
+            dataList = courseScheduleDao.findGroupCourseSchedules(vipGroup.getId().toString(), queryInfo.getGroupType());
         }
 		if(!CollectionUtils.isEmpty(dataList)){
 			if(StringUtils.isNotEmpty(queryInfo.getSearch())){