Explorar el Código

老师布置作业时新增分谱

zouxuan hace 3 años
padre
commit
c258bffb64

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseHomeworkStudentDetailDto.java

@@ -64,6 +64,9 @@ public class CourseHomeworkStudentDetailDto {
     @ApiModelProperty(value = "伴奏编号",required = false)
     private String musicScoreId;
 
+    @ApiModelProperty(value = "伴奏编号(包含分谱)",required = false)
+    private String musicScoreContent;
+
     private String musicScoreName;
 
     private String type;
@@ -76,6 +79,14 @@ public class CourseHomeworkStudentDetailDto {
     
     private MusicGroupTrainPlan musicGroupTrainPlan;
 
+    public String getMusicScoreContent() {
+        return musicScoreContent;
+    }
+
+    public void setMusicScoreContent(String musicScoreContent) {
+        this.musicScoreContent = musicScoreContent;
+    }
+
     public SysMusicScore getSysMusicScore() {
         return sysMusicScore;
     }

+ 1 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExtracurricularExercisesReplyServiceImpl.java

@@ -123,6 +123,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 			detail.setSysMusicScore(sysMusicScore);
 			detail.setMusicScoreId(sysMusicScore.getId().toString());
 			detail.setMusicScoreName(sysMusicScore.getName());
+			detail.setMusicScoreContent(extraExerciseReply.getMusicScoreContent());
 		}
 		Student student = studentDao.get(extraExerciseReply.getUserId());
 		detail.setHasMember(student.getMemberRankSettingId()==null?0:1);

+ 2 - 1
mec-biz/src/main/resources/config/mybatis/ExtracurricularExercisesReplyMapper.xml

@@ -210,7 +210,8 @@
 			ee.content_,
 			ee.expire_date_,
 			ee.teacher_id_,
-			ee.music_score_id_,
+			eer.music_score_id_,
+			eer.music_score_content_,
 			su.username_ student_name_
 		FROM
 			extracurricular_exercises_reply eer

+ 2 - 0
mec-biz/src/main/resources/config/mybatis/StudentCourseHomeworkMapper.xml

@@ -43,6 +43,7 @@
         <result column="attachments_" property="attachments"/>
         <result column="score_" property="score"/>
         <result column="music_score_id_" property="musicScoreId"/>
+        <result column="music_score_content_" property="musicScoreContent"/>
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="is_replied_" property="isReplied" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
@@ -231,6 +232,7 @@
                ch.expect_num_,
                ch.expiry_date_,
                sch.music_score_id_,
+               sch.music_score_content_,
                sch.id_  studentCourseHomeworkId,
                sch.attachments_,
                sch.score_,