Merge branch 'online1'

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

@@ -1839,7 +1839,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         pageInfo.setRegNum(registerNum);
         RegisterDto registerOrPreMinTime = studentRegistrationDao.getRegisterOrPreMinTime(queryInfo.getMusicGroupId());
         if(registerOrPreMinTime.getMinPayTime() != null){
-            Date startTime = DateUtil.trunc(registerOrPreMinTime.getPayTime());
+            Date startTime = DateUtil.trunc(registerOrPreMinTime.getMinPayTime());
             Date endTime = DateUtil.getLastTimeWithDay(startTime);
             int firstPayNum = studentRegistrationDao.getFirstPayNum(queryInfo.getMusicGroupId(), startTime, endTime);
             int totalPayNum = studentRegistrationDao.getFirstPayNum(queryInfo.getMusicGroupId(), startTime,null);

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

@@ -2969,6 +2969,8 @@ public class ExportController extends BaseController {
                 throw new BizException("非法请求");
             }
         }
+        queryInfo.setPage(1);
+        queryInfo.setRows(49999);
         List<IndexErrorDataExportDto> result = indexErrDataRecordService.queryRecord(queryInfo).getRows();
         if (CollectionUtils.isEmpty(result)) {
             response.setStatus(200);