add 教务端统计乐团回款

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

@@ -1851,8 +1851,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         pageInfo.setTotal(count);
         params.put("offset", pageInfo.getOffset());
         if (queryInfo.getPage() <= pageInfo.getTotalPage()) {
-            Date firstPreTime = registerOrPreMinTime.getMinPerRegisterTime();
-            Date firstPayTime = registerOrPreMinTime.getMinPayTime();
+            Date firstPreTime = registerOrPreMinTime != null ?registerOrPreMinTime.getMinPerRegisterTime():null;
+            Date firstPayTime = registerOrPreMinTime != null ?registerOrPreMinTime.getMinPayTime():null;
             dataList = studentRegistrationDao.getRegisterOrPreList(params);
             for (RegisterDto registerDto : dataList) {
                 if (DateUtil.dateToString(registerDto.getPerRegisterTime()).equals("2099-12-31") ||
@@ -1866,13 +1866,13 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 ) {
                     registerDto.setPayTime(null);
                 }
-                if (registerDto.getPerRegisterTime() != null) {
+                if (firstPreTime != null && registerDto.getPerRegisterTime() != null) {
                     int perRegInterval = DateUtil.secondsBetween(firstPreTime, registerDto.getPerRegisterTime());
                     registerDto.setPerRegInterval(perRegInterval);
                     registerDto.setPerRegIntervalStr(DateUtil.secondsFormat(perRegInterval));
                 }
 
-                if (registerDto.getPayTime() != null) {
+                if (firstPayTime != null && registerDto.getPayTime() != null) {
                     int payTimeInterval = DateUtil.secondsBetween(firstPayTime, registerDto.getPayTime());
                     registerDto.setPayInterval(payTimeInterval);
                     registerDto.setPayIntervalStr(DateUtil.secondsFormat(payTimeInterval));