2 Commits b6a709d49c ... 69fd0d1b97

Author SHA1 Message Date
  刘俊驰 69fd0d1b97 Merge branch 'feature/250324' into dev 3 weeks ago
  刘俊驰 80135b2600 加字段 3 weeks ago

+ 2 - 0
mec-application/src/main/java/com/ym/mec/student/controller/MusicPracticeRecordController.java

@@ -78,6 +78,8 @@ public class MusicPracticeRecordController {
         CbsMusicSheetWrapper.MusicSheet musicSheet = musicSheetService.cbsDetail(Integer.parseInt(wrapper.getMusicSheetId()),simpleFlag);
         if (musicSheet != null) {
             from.setRhythmFlag(musicSheet.getEvaluationStandard() != EEvaluationStandard.FREQUENCY);
+            from.setMusicSheetName(musicSheet.getName());
+            from.setEvaluationStandard(musicSheet.getEvaluationStandard());
         }
 
         return R.from(from);

+ 2 - 0
mec-application/src/main/java/com/ym/mec/teacher/controller/MusicPracticeRecordController.java

@@ -79,6 +79,8 @@ public class MusicPracticeRecordController {
         CbsMusicSheetWrapper.MusicSheet musicSheet = musicSheetService.cbsDetail(Integer.parseInt(wrapper.getMusicSheetId()),simpleFlag);
         if (musicSheet != null) {
             from.setRhythmFlag(musicSheet.getEvaluationStandard() != EEvaluationStandard.FREQUENCY);
+            from.setMusicSheetName(musicSheet.getName());
+            from.setEvaluationStandard(musicSheet.getEvaluationStandard());
         }
 
         return R.from(from);