新增训练说明

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseHomeworkWrapper.java

@@ -242,6 +242,7 @@ public class CourseHomeworkWrapper {
         @ApiModelProperty("达标人数")
         private Integer passNum;
 
+        private String memo;
 
         @ApiModelProperty("练习内容")
         private List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> trainingDetailList;

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentLessonExaminationDetailDto.java

@@ -57,5 +57,7 @@ public class StudentLessonExaminationDetailDto {
     @ApiModelProperty(value = "曲目是否有效")
     private Boolean validFlag;
 
+    private String memo;
+
 }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentLessonExaminationSaveDto.java

@@ -21,6 +21,8 @@ public class StudentLessonExaminationSaveDto {
     @ApiModelProperty("作业分组")
     private Integer group;
 
+    private String memo;
+
     @ApiModelProperty(value = "作业内容")
     private List<LessonExaminationDetailDto> examinationDetailDtos;
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentCourseHomework.java

@@ -110,6 +110,8 @@ public class StudentCourseHomework extends BaseEntity {
 
 	@ApiModelProperty(value = "是否已查看")
 	private YesOrNoEnum isView;
+
+	private String memo;
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentLessonExaminationDetail.java

@@ -82,6 +82,10 @@ public class StudentLessonExaminationDetail implements Serializable {
     @ApiModelProperty(value = "最后提交时间")
     private Date trainingTime;
 
+    @TableField("memo_")
+    @ApiModelProperty(value = "备注")
+    private String memo;
+
     @TableField("create_time_")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;

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

@@ -835,8 +835,10 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
 
             for (StudentCourseHomework studentCourseHomework1 : studentCourseHomeworkByCourse) {
                 if (studentLessonTrainingDetailMap.containsKey(studentCourseHomework1.getUserId().longValue())) {
-                    List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> studentLessonTrainingDetails1 = studentLessonTrainingDetailMap.get(studentCourseHomework1.getUserId().longValue());
+                    List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> studentLessonTrainingDetails1 =
+                            studentLessonTrainingDetailMap.get(studentCourseHomework1.getUserId().longValue());
                     studentCourseHomework1.setStudentLessonTrainingDetail(studentLessonTrainingDetails1);
+                    studentCourseHomework1.setMemo(studentLessonTrainingDetails1.get(0).getMemo());
                 }
             }
         }

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

@@ -53,6 +53,7 @@ public class StudentLessonExaminationDetailServiceImpl extends ServiceImpl<Stude
                     LessonExaminationDetailDto vo = detailDtos.get(i);
                     StudentLessonExaminationDetail studentLessonExaminationDetail = new StudentLessonExaminationDetail();
                     studentLessonExaminationDetail.setUserId(studentId);
+                    studentLessonExaminationDetail.setMemo(dto.getMemo());
                     studentLessonExaminationDetail.setLessonExaminationId(lessonExaminationId);
                     studentLessonExaminationDetail.setMusicScoreId(vo.getMusicScoreId());
                     studentLessonExaminationDetail.setHeardLevel(vo.getHeardLevel());

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

@@ -342,7 +342,8 @@ public class StudentLessonTrainingDetailServiceImpl extends ServiceImpl<StudentL
 
             }
 
-            studentLessonTrainingStat.setSubjectName(subjectNameList.stream().collect(Collectors.joining(",")));
+            studentLessonTrainingStat.setMemo(v.get(0).getMemo());
+            studentLessonTrainingStat.setSubjectName(String.join(",", subjectNameList));
             studentLessonTrainingStat.setStudentNum(userIds.size());
             studentLessonTrainingStat.setShouldSubmitNum(userIds.size());
             studentLessonTrainingStat.setSubmitNum(submitNum);

mec-biz/src/main/resources/config/mybatis/StudentLessonExaminationDetailMapper.xml

@@ -16,6 +16,7 @@
         <result column="actual_avg_score_" property="actualAvgScore"/>
         <result column="part_index_" property="partIndex"/>
         <result column="training_time_" property="trainingTime"/>
+        <result column="memo_" property="memo"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
     </resultMap>
@@ -23,18 +24,18 @@
     <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.ym.mec.biz.dal.entity.StudentLessonExaminationDetail">
         insert into student_lesson_examination_detail(user_id_, lesson_examination_id_, music_score_id_, heard_level_,standard_score_,
-                                                      avg_score_, part_index_,start_,end_)
+                                                      avg_score_, part_index_,start_,end_,memo_)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.userId}, #{entity.lessonExaminationId},#{entity.musicScoreId}, #{entity.heardLevel,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-             #{entity.standardScore}, #{entity.avgScore},#{entity.partIndex},#{entity.start},#{entity.end})
+             #{entity.standardScore}, #{entity.avgScore},#{entity.partIndex},#{entity.start},#{entity.end},#{entity.memo})
         </foreach>
     </insert>
     <select id="queryAll" resultType="com.ym.mec.biz.dal.dto.StudentLessonExaminationDetailDto">
         select sms.name_ musicScoreName,sled.id_ studentLessonExaminationDetailId, sled.user_id_ userId, sled.lesson_examination_id_ lessonExaminationId, sled.music_score_id_ musicScoreId,
                sled.heard_level_ heardLevel, sled.training_score_ trainingScore,sled.avg_score_ avgScore, sled.actual_avg_score_ actualAvgScore, sled.start_ start, sled.end_ end,
                sled.standard_score_ standardScore, sled.part_index_ partIndex,CASE WHEN sled.training_time_ IS NULL THEN 0 ELSE 1 END trainingFlag,
-               sms.del_flag_ = 0 AND sms.show_flag_ = 1 validFlag
+               sms.del_flag_ = 0 AND sms.show_flag_ = 1 validFlag,sled.memo_ memo
         from student_lesson_examination_detail sled
         left join sys_music_score sms ON sms.id_ = sled.music_score_id_
         <where>