Merge branch 'music_score'

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

@@ -3,9 +3,9 @@ package com.ym.mec.biz.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum HeardLevelEnum implements BaseEnum<String, HeardLevelEnum> {
-    BEGINNER("BEGINNER","初学者", 9, 0.05f, 0),
-    ADVANCED("ADVANCED","进阶者", 3, 0.09f, 0),
-    PERFORMER("PERFORMER","小演奏家", 1, 0.3f, 0);
+    BEGINNER("BEGINNER","入门级", 9, 0.05f, 0),
+    ADVANCED("ADVANCED","进阶级", 3, 0.09f, 0),
+    PERFORMER("PERFORMER","大师级", 1, 0.3f, 0);
 
     private String code;
 

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

@@ -99,22 +99,19 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		if(StringUtils.isBlank(userLastEvaluationData.getScoreData())){
 			return null;
 		}
-		HashMap<String, Object> result = new HashMap<>();
-		result.put("score", userLastEvaluationData.getScore());
-		result.put("cadence", userLastEvaluationData.getCadence());
-		result.put("intonation", userLastEvaluationData.getIntonation());
-		result.put("integrity", userLastEvaluationData.getIntegrity());
+
+		JSONObject jsonObject = JSON.parseObject(userLastEvaluationData.getScoreData());
+		jsonObject.put("score", userLastEvaluationData.getScore());
+		jsonObject.put("cadence", userLastEvaluationData.getCadence());
+		jsonObject.put("intonation", userLastEvaluationData.getIntonation());
+		jsonObject.put("integrity", userLastEvaluationData.getIntegrity());
+		jsonObject.put("heardLevel", userLastEvaluationData.getHeardLevel());
 
 		SysMusicScore sysMusicScore = sysMusicScoreDao.get(userLastEvaluationData.getSysMusicScoreId());
 		if(Objects.nonNull(sysMusicScore)){
-			result.put("sysMusicScoreName", sysMusicScore.getName());
-		}
-
-		JSONObject jsonObject = JSON.parseObject(userLastEvaluationData.getScoreData());
-		if(jsonObject.containsKey("musicalNotesPlayStats")){
-			result.put("musicalNotesPlayStats", jsonObject.get("musicalNotesPlayStats"));
+			jsonObject.put("sysMusicScoreName", sysMusicScore.getName());
 		}
-		return result;
+		return jsonObject;
 	}
 
 	@Override