新增训练说明

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

@@ -22,8 +22,6 @@ public class CourseHomeworkListDto {
     /** 作业内容 */
     private String title;
 
-    private String memo;
-
     /**  */
     private java.util.Date createTime;
 

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

@@ -31,6 +31,4 @@ public class StudentCourseHomeworkDto {
     private Integer isView;
 
     private Long studentCourseHomeworkId;
-
-    private String memo;
 }

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

@@ -74,6 +74,4 @@ public class StudentHomeworkRecordDto {
 
     @ApiModelProperty("提交时间")
     private Date submitTime;
-
-    private String memo;
 }

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

@@ -30,8 +30,6 @@ public class StudentVisitCourseHomeWorkDto {
     @ApiModelProperty(value = "作业内容",required = false)
     private String content;
 
-    private String memo;
-
     @ApiModelProperty(value = "提交状态",required = false)
     private YesOrNoEnum status;
 

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

@@ -72,7 +72,6 @@ public class ExtracurricularExercisesReply extends BaseEntity {
 	@ApiModelProperty(value = "作业评级",required = true)
 	private StandardEnum standardFlag;
 
-	private String memo;
 
 	@Override
 	public String toString() {

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

@@ -110,8 +110,6 @@ 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/StudentLessonTrainingDetail.java

@@ -88,6 +88,10 @@ public class StudentLessonTrainingDetail implements Serializable {
     @TableField(value = "music_score_name_")
     private String musicScoreName;
 
+    @ApiModelProperty("训练说明")
+    @TableField(value = "memo_")
+    private String memo;
+
     @ApiModelProperty("创建时间") 
 	@TableField(value = "create_time_")
     private Date createTime;

mec-biz/src/main/java/com/ym/mec/biz/service/StudentLessonTrainingDetailService.java

@@ -45,7 +45,12 @@ public interface StudentLessonTrainingDetailService extends IService<StudentLess
      * @param userIdList                   学生ID
      * @param group
      */
-    List<StudentLessonTrainingDetail> homeWorkDetail(List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails, List<Integer> userIdList, Long homeworkId, ELessonTrainingType type, Integer group);
+    List<StudentLessonTrainingDetail> homeWorkDetail(List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails,
+                                                     List<Integer> userIdList,
+                                                     Long homeworkId,
+                                                     ELessonTrainingType type,
+                                                     Integer group,
+                                                     String memo);
 
     /**
      * 查询布置的作业详情

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

@@ -120,7 +120,6 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
                 // 原本作业逻辑
                 for (Integer userId : musicScoreSubjectDto.getUserIdList()) {
                     studentExtraExercise.setUserId(userId);
-                    studentExtraExercise.setMemo(musicScoreSubjectDto.getMemo());
                     studentExtraExercise.setMusicScoreId(StringUtils.join(musicScoreSubjectDto.getMusicScoreIdList(),","));
                     studentExtraExercise.setMusicScoreContent(JSONObject.toJSONString(musicScoreSubjectDto.getMusicScoreHomeworkDtoList()));
                     extracurricularExercisesReplies.add(JSON.parseObject(JSON.toJSONString(studentExtraExercise),ExtracurricularExercisesReply.class));
@@ -133,8 +132,13 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
                 }
                 // 作业详情
                 studentLessonTrainingDetailList.addAll(studentLessonTrainingDetailService
-                                   .homeWorkDetail(musicScoreSubjectDto.getStudentLessonTrainingDetails(), musicScoreSubjectDto.getUserIdList(), exercises.getId(),
-                                                   ELessonTrainingType.valueOf(exercises.getGroupType()),musicScoreSubjectDto.getGroup()));
+                                   .homeWorkDetail(musicScoreSubjectDto.getStudentLessonTrainingDetails(),
+                                           musicScoreSubjectDto.getUserIdList(),
+                                           exercises.getId(),
+                                           ELessonTrainingType.valueOf(exercises.getGroupType()),
+                                           musicScoreSubjectDto.getGroup(),
+                                           musicScoreSubjectDto.getMemo()
+                                   ));
 
             }
         } else {
@@ -145,8 +149,12 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
             }
             // 作业详情
             studentLessonTrainingDetailList.addAll(studentLessonTrainingDetailService
-                                                       .homeWorkDetail(exercises.getStudentLessonTrainingDetails(), studentIds,exercises.getId(),
-                                                       ELessonTrainingType.valueOf(exercises.getGroupType()), null));
+                                                       .homeWorkDetail(exercises.getStudentLessonTrainingDetails(),
+                                                               studentIds,
+                                                               exercises.getId(),
+                                                               ELessonTrainingType.valueOf(exercises.getGroupType()),
+                                                               null,
+                                                               exercises.getMemo()));
         }
         for (ExtracurricularExercisesReply extracurricularExercisesReply : extracurricularExercisesReplies) {
             extracurricularExercisesReplyDao.insert(extracurricularExercisesReply);

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

@@ -93,7 +93,11 @@ public class StudentLessonTrainingDetailServiceImpl extends ServiceImpl<StudentL
      */
     @Override
     public List<StudentLessonTrainingDetail> homeWorkDetail(List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> detailList,
-                                                            List<Integer> userIdList, Long homeworkId, ELessonTrainingType type, Integer group) {
+                                                            List<Integer> userIdList,
+                                                            Long homeworkId,
+                                                            ELessonTrainingType type,
+                                                            Integer group,
+                                                            String memo) {
         log.info("将作业标准 转换为 需要的作业详情 {},{}", detailList, userIdList);
         // 保存作业标准
         if (CollectionUtils.isEmpty(detailList) || CollectionUtils.isEmpty(userIdList)) {
@@ -121,6 +125,7 @@ public class StudentLessonTrainingDetailServiceImpl extends ServiceImpl<StudentL
             studentLessonTrainingDetail.setUpdateTime(date);
             studentLessonTrainingDetail.setGroup(group);
             studentLessonTrainingDetail.setType(type);
+            studentLessonTrainingDetail.setMemo(memo);
         }
         return result;
     }

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

@@ -422,9 +422,12 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
                                 studentLessonTrainingDetail.setSubjectId(0);
                             }
                             studentLessonTrainingDetails.addAll(studentLessonTrainingDetailService
-                                                                    .homeWorkDetail(scoreSubjectDto.getStudentLessonTrainingDetails(), userIdList,
-                                                                            courseHomework.getId(),ELessonTrainingType.HOMEWORK, scoreSubjectDto.getGroup()));
-							studentCourseHomeworks.forEach(studentCourseHomework -> studentCourseHomework.setMemo(scoreSubjectDto.getMemo()));
+                                                                    .homeWorkDetail(scoreSubjectDto.getStudentLessonTrainingDetails(),
+																			userIdList,
+																			courseHomework.getId(),
+																			ELessonTrainingType.HOMEWORK,
+																			scoreSubjectDto.getGroup(),
+																			scoreSubjectDto.getMemo()));
 						}
 					}else {
 						studentCourseHomeworks.addAll(studentCourseHomeworkDao.constructInitialStudentHomeworkRecordsWithPayment(teacherAttendance.getCourseScheduleId(),
@@ -437,8 +440,12 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
                                                                       .map(StudentCourseHomework::getUserId)
                                                                       .collect(Collectors.toList());
                         studentLessonTrainingDetails.addAll(studentLessonTrainingDetailService
-                                                                .homeWorkDetail(courseHomeworkInfo.getStudentLessonTrainingDetails(), userIdList,courseHomework.getId(),ELessonTrainingType.HOMEWORK,null));
-						studentCourseHomeworks.forEach(studentCourseHomework -> studentCourseHomework.setMemo(courseHomeworkInfo.getMemo()));
+                                                                .homeWorkDetail(courseHomeworkInfo.getStudentLessonTrainingDetails(),
+																		userIdList,
+																		courseHomework.getId(),
+																		ELessonTrainingType.HOMEWORK,
+																		null,
+																		courseHomeworkInfo.getMemo()));
 
 					}
 					if(CollectionUtils.isEmpty(studentCourseHomeworks)){

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

@@ -31,7 +31,6 @@
 		<result column="type" property="type" />
 		<result column="push_flag_" property="pushFlag" />
 		<result column="group_type_" property="groupType" />
-		<result column="memo_" property="memo" />
 	</resultMap>
 
 	<sql id="queryPageCondition">
@@ -155,7 +154,7 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ExtracurricularExercises" parameterType="map">
 		SELECT ee.id_,ee.teacher_id_,ee.student_id_list_,ee.group_type_ as type,ee.batch_no_,ee.title_,ee.attachments_,ee.music_group_id_,
-		       ee.content_,ee.expire_date_,ee.completed_num_,ee.expect_num_,ee.create_time_,ee.update_time_,ee.tenant_id_,eer.memo_,
+		       ee.content_,ee.expire_date_,ee.completed_num_,ee.expect_num_,ee.create_time_,ee.update_time_,ee.tenant_id_,
 		     ,u.real_name_ username_,o.name_ organ_name_,eer.music_score_id_,ee.create_time_ as assignTime,
 		      mg.name_ as musicGroupName,ee.class_group_id_ as classGroupId,ee.version_tag_ as versionTag
 		FROM extracurricular_exercises ee LEFT JOIN sys_user u ON ee.teacher_id_ = u.id_

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

@@ -29,7 +29,6 @@
         <result column="music_score_content_" property="musicScoreContent"/>
         <result column="tenant_id_" property="tenantId"/>
         <result column="subject_id_" property="subjectId"/>
-        <result column="memo_" property="memo"/>
         <result column="standard_flag_" property="standardFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
@@ -40,7 +39,6 @@
         <result column="course_schedule_id_" property="courseScheduleId"/>
         <result column="studentCourseHomeworkId" property="studentCourseHomeworkId"/>
         <result column="content_" property="content"/>
-        <result column="memo_" property="memo"/>
         <result column="expiry_date_" property="expiryDate"/>
         <result column="completed_num_" property="completedNum"/>
         <result column="expect_num_" property="expectNum"/>
@@ -92,7 +90,7 @@
         INSERT INTO student_course_homework
         (user_id_,course_schedule_id_,course_homework_id_,attachments_,score_,create_time_,
          update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,music_score_id_,
-         music_score_content_,tenant_id_,standard_flag_,group_type_,memo_)
+         music_score_content_,tenant_id_,standard_flag_,group_type_)
         VALUE
         <foreach collection="list" item="homework" separator=",">
             (#{homework.userId},#{homework.courseScheduleId},#{homework.courseHomeworkId},#{homework.attachments},
@@ -101,7 +99,7 @@
             #{homework.isView,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{homework.isRepliedTimely},
             #{homework.musicScoreId},#{homework.musicScoreContent},#{homework.tenantId},
             #{homework.standardFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            #{homework.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{homework.memo})
+            #{homework.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
         </foreach>
     </insert>
 
@@ -134,9 +132,6 @@
             <if test="remark != null">
                 remark_ = #{remark},
             </if>
-            <if test="memo != null">
-                memo_ = #{memo},
-            </if>
             <if test="status != null">
                 status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
@@ -167,7 +162,6 @@
         <result column="id_" property="id"/>
         <result column="course_schedule_id_" property="courseScheduleId"/>
         <result column="content_" property="content"/>
-        <result column="memo_" property="memo"/>
         <result column="create_time_" property="createTime"/>
         <result column="start_class_time_" property="startClassTime"/>
         <result column="expiry_date_" property="expiryDate"/>
@@ -210,7 +204,6 @@
     <select id="queryPage" resultMap="CourseHomeworkDto" parameterType="map">
         SELECT
         sch.id_,
-        sch.memo_,
         ch.*,
         IF(cs.group_type_='MUSIC',mg.name_,NULL) music_group_name_,
         cg.name_ class_group_name_,
@@ -260,8 +253,7 @@
                sch.is_replied_,
                sch.course_schedule_id_,
                sch.standard_flag_,
-               sch.submit_time_,
-               sch.memo_
+               sch.submit_time_
         FROM course_homework ch
                  LEFT JOIN student_course_homework sch ON ch.id_ = sch.course_homework_id_
                  LEFT JOIN music_group mg ON ch.music_group_id_ = mg.id_
@@ -347,7 +339,6 @@
         <result column="username_" property="studentName"/>
         <result column="phone_" property="phone"/>
         <result column="subject_name_" property="subjectNames"/>
-        <result column="memo_" property="memo"/>
         <result column="attachments_" property="url"/>
         <result column="is_replied_" property="isReplied"/>
         <result column="is_view_" property="isView"/>
@@ -355,7 +346,7 @@
         <result column="submit_time_" property="submitTime"/>
     </resultMap>
     <select id="findStudentCourseHomeworks" resultMap="StudentCourseHomeworkDtoMap">
-        SELECT sch.id_ student_course_homework_id_,sch.attachments_,sch.is_replied_,sch.is_view_,sch.memo_,
+        SELECT sch.id_ student_course_homework_id_,sch.attachments_,sch.is_replied_,sch.is_view_,
         sch.update_time_,cssp.user_id_,su.username_,su.phone_,sch.submit_time_,s.name_ subject_name_
         FROM student_course_homework sch
         LEFT JOIN course_schedule_student_payment cssp ON sch.course_schedule_id_ = cssp.course_schedule_id_ AND cssp.user_id_ =
@@ -372,7 +363,6 @@
         <result property="studentCourseHomeworkId" column="student_course_homework_id_"/>
         <result property="courseScheduleId" column="course_schedule_id_"/>
         <result property="courseName" column="course_name_"/>
-        <result property="memo" column="memo_"/>
         <result property="startClassTime" column="start_class_time_"/>
         <result property="teacherId" column="actual_teacher_id_"/>
         <result property="status" column="status_"/>
@@ -391,7 +381,6 @@
         sch.id_ student_course_homework_id_,
         sch.course_schedule_id_,
         cs.name_ course_name_,
-        sch.memo_,
         CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
         CONCAT(cs.class_date_,' ',cs.end_class_time_) endClassTime,
         cs.actual_teacher_id_,
@@ -540,7 +529,6 @@
         <result column="courseName" property="courseName"/>
         <result column="createTime" property="createTime"/>
         <result column="teacherName" property="teacherName"/>
-        <result column="memo_" property="memo"/>
         <result column="content" property="content"/>
         <result column="status" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="isReplied" property="isReplied" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
@@ -556,8 +544,7 @@
         ch.content_ content,
         sch.status_ status,
         sch.is_replied_ isReplied,
-        sch.is_view_ isView,
-        sch.memo_
+        sch.is_view_ isView
         FROM student_course_homework sch
         LEFT JOIN course_homework ch ON ch.id_ = sch.course_homework_id_
         LEFT JOIN course_schedule cs ON cs.id_ = sch.course_schedule_id_
@@ -601,8 +588,7 @@
             COUNT( sch.user_id_ ) exceptStudentNum,
             SUM( sch.status_ ) submitStudentNum,
             SUM( sch.is_replied_ ) repliedStudentNum,
-            sch.music_score_id_ musicScoreId,
-            sch.memo_ memo
+            sch.music_score_id_ musicScoreId
         FROM
             course_homework ch
             LEFT JOIN music_group mg ON mg.id_ = ch.music_group_id_