Merge remote-tracking branch 'origin/master'

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

@@ -84,7 +84,7 @@ public class TeacherClassGroupDto {
     private String studyReportUrl;
 
     @ApiModelProperty(value = "是否已有报告")
-    private Boolean hasReport;
+    private Boolean hasReport=false;
 
     public Date getCourseStartDate() {
         return courseStartDate;

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

@@ -2884,7 +2884,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         params.put("courseScheduleIds", courseScheduleIdSet);
         List<CourseScheduleEndDto> results = new ArrayList<>();
         int count = courseScheduleDao.endCountCourseSchedules(params);
-        if(queryInfo.getIsExport() && count > 2000){
+        if(queryInfo.getIsExport() && count > 50000){
             throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
         }
         if (count > 0) {

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -67,8 +67,7 @@ public class ExportController extends BaseController {
     @Autowired
     private SporadicChargeInfoService sporadicChargeInfoService;
 
-
-    @ApiOperation(value = "导出学员是否有课")
+    @ApiOperation(value = "导出学员列表")
     @PostMapping("export/studentHasCourse")
     @PreAuthorize("@pcs.hasPermissions('export/studentHasCourse')")
     public void studentHasCourse(HttpServletResponse response, StudentManageQueryInfo queryInfo) {