Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/StudentAttendanceStatusEnum.java

@@ -9,7 +9,8 @@ public enum StudentAttendanceStatusEnum implements BaseEnum<String,StudentAttend
     NORMAL("NORMAL","正常"),
     TRUANT("TRUANT","旷课"),
     LEAVE("LEAVE","请假"),
-    DROP_OUT("DROP_OUT","退学");
+    DROP_OUT("DROP_OUT","退学"),
+    LATE("LATE","迟到");
 
     private String code;
 

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

@@ -2037,7 +2037,8 @@ public class ExportServiceImpl implements ExportService {
             	
             	currentFee = row.getServiceFee();
                 
-				if (currentFee == null || currentFee.floatValue() == 0) {
+            	//兼容2022年之前的数据
+				if (currentFee == null || (currentFee.floatValue() == 0 && row.getCreateTime().before(DateUtil.stringToDate("2022-01-01 00:00:00")))) {
 					transferFee = serviceChargeMap.get(row.getOrderNo());
 					if (transferFee == null) {
 						transferFee = BigDecimal.ZERO;

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

@@ -566,9 +566,10 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		//云教练新用户人数
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.CLOUD_NEW_STUDENT_NUM)) {
 			List<Integer> studentIdList = studentRegistrationDao.findStudentIds(tenantId);
-			saveData(studentDao.groupOrganId(null,studentIdList),LocalDate.now().toString(),IndexDataType.CLOUD_NEW_STUDENT_NUM, tenantId);
+			if(!CollectionUtils.isEmpty(studentIdList)){
+				saveData(studentDao.groupOrganId(null,studentIdList),LocalDate.now().toString(),IndexDataType.CLOUD_NEW_STUDENT_NUM, tenantId);
+			}
 		}
-
 	}
 
 	/**