feat:智能陪练一期

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

@@ -99,22 +99,18 @@ 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());
 
 		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