新增训练说明

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

@@ -1,11 +1,14 @@
 package com.ym.mec.biz.dal.dto;
 
+import lombok.Data;
+
 import java.util.Date;
 
 /**
  * @Author Joburgess
  * @Date 2021/5/24 0024
  */
+@Data
 public class EduHomeworkCardDto {
 
     private String groupId;
@@ -38,123 +41,5 @@ public class EduHomeworkCardDto {
 
     private String musicScoreId;
 
-    public String getMusicScoreId() {
-        return musicScoreId;
-    }
-
-    public void setMusicScoreId(String musicScoreId) {
-        this.musicScoreId = musicScoreId;
-    }
-
-    public String getTeacherAvatar() {
-        return teacherAvatar;
-    }
-
-    public void setTeacherAvatar(String teacherAvatar) {
-        this.teacherAvatar = teacherAvatar;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public Integer getSubjectId() {
-        return subjectId;
-    }
-
-    public void setSubjectId(Integer subjectId) {
-        this.subjectId = subjectId;
-    }
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getHomeworkId() {
-        return homeworkId;
-    }
-
-    public void setHomeworkId(Long homeworkId) {
-        this.homeworkId = homeworkId;
-    }
-
-    public Long getCourseId() {
-        return courseId;
-    }
-
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public Date getCourseStartTime() {
-        return courseStartTime;
-    }
-
-    public void setCourseStartTime(Date courseStartTime) {
-        this.courseStartTime = courseStartTime;
-    }
-
-    public Integer getTeacherId() {
-        return teacherId;
-    }
-
-    public void setTeacherId(Integer teacherId) {
-        this.teacherId = teacherId;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public Integer getExceptStudentNum() {
-        return exceptStudentNum;
-    }
-
-    public void setExceptStudentNum(Integer exceptStudentNum) {
-        this.exceptStudentNum = exceptStudentNum;
-    }
-
-    public Integer getSubmitStudentNum() {
-        return submitStudentNum;
-    }
-
-    public void setSubmitStudentNum(Integer submitStudentNum) {
-        this.submitStudentNum = submitStudentNum;
-    }
-
-    public Integer getRepliedStudentNum() {
-        return repliedStudentNum;
-    }
-
-    public void setRepliedStudentNum(Integer repliedStudentNum) {
-        this.repliedStudentNum = repliedStudentNum;
-    }
+    private String memo;
 }

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

@@ -1,8 +1,11 @@
 package com.ym.mec.biz.dal.dto;
 
 
+import lombok.Data;
+
 import java.util.Date;
 
+@Data
 public class StudentCourseHomeworkDto {
 
     private Integer studentId;
@@ -29,99 +32,5 @@ public class StudentCourseHomeworkDto {
 
     private Long studentCourseHomeworkId;
 
-    public Long getStudentCourseHomeworkId() {
-        return studentCourseHomeworkId;
-    }
-
-    public void setStudentCourseHomeworkId(Long studentCourseHomeworkId) {
-        this.studentCourseHomeworkId = studentCourseHomeworkId;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public Integer getStudentId() {
-        return studentId;
-    }
-
-    public void setStudentId(Integer studentId) {
-        this.studentId = studentId;
-    }
-
-    public String getAttachments() {
-        return attachments;
-    }
-
-    public void setAttachments(String attachments) {
-        this.attachments = attachments;
-    }
-
-    public Date getSubmitTime() {
-        return submitTime;
-    }
-
-    public void setSubmitTime(Date submitTime) {
-        this.submitTime = submitTime;
-    }
-
-    public String getStudentName() {
-        return studentName;
-    }
-
-    public void setStudentName(String studentName) {
-        this.studentName = studentName;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Integer getIsReplied() {
-        return isReplied;
-    }
-
-    public void setIsReplied(Integer isReplied) {
-        this.isReplied = isReplied;
-    }
-
-    public String getSubjectIds() {
-        return subjectIds;
-    }
-
-    public void setSubjectIds(String subjectIds) {
-        this.subjectIds = subjectIds;
-    }
-
-    public String getSubjectNames() {
-        return subjectNames;
-    }
-
-    public void setSubjectNames(String subjectNames) {
-        this.subjectNames = subjectNames;
-    }
-
-    public Integer getIsView() {
-        return isView;
-    }
-
-    public void setIsView(Integer isView) {
-        this.isView = isView;
-    }
+    private String memo;
 }

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dto;
 import com.ym.mec.biz.dal.enums.ELessonTrainingType;
 import com.ym.mec.biz.dal.enums.StandardEnum;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.Date;
 
@@ -10,6 +11,7 @@ import java.util.Date;
  * @Author Joburgess
  * @Date 2020/3/20
  */
+@Data
 public class StudentHomeworkRecordDto {
 
     @ApiModelProperty(value = "学生作业ID")
@@ -73,163 +75,5 @@ public class StudentHomeworkRecordDto {
     @ApiModelProperty("提交时间")
     private Date submitTime;
 
-    public Date getSubmitTime() {
-        return submitTime;
-    }
-
-    public void setSubmitTime(Date submitTime) {
-        this.submitTime = submitTime;
-    }
-
-    public StandardEnum getStandardFlag() {
-        return standardFlag;
-    }
-
-    public void setStandardFlag(StandardEnum standardFlag) {
-        this.standardFlag = standardFlag;
-    }
-
-    public ELessonTrainingType getType() {
-        return type;
-    }
-
-    public void setType(ELessonTrainingType type) {
-        this.type = type;
-    }
-
-    public Boolean getFinishStatus() {
-        return finishStatus;
-    }
-
-    public void setFinishStatus(Boolean finishStatus) {
-        this.finishStatus = finishStatus;
-    }
-
-    public Date getEndClassTime() {
-        return endClassTime;
-    }
-
-    public void setEndClassTime(Date endClassTime) {
-        this.endClassTime = endClassTime;
-    }
-
-    public String getMusicGroupId() {
-        return musicGroupId;
-    }
-
-    public void setMusicGroupId(String musicGroupId) {
-        this.musicGroupId = musicGroupId;
-    }
-
-    public String getMusicGroupName() {
-        return musicGroupName;
-    }
-
-    public void setMusicGroupName(String musicGroupName) {
-        this.musicGroupName = musicGroupName;
-    }
-
-    public String getMusicGroupImg() {
-        return musicGroupImg;
-    }
-
-    public void setMusicGroupImg(String musicGroupImg) {
-        this.musicGroupImg = musicGroupImg;
-    }
-
-    public Integer getClassGroupId() {
-        return classGroupId;
-    }
-
-    public void setClassGroupId(Integer classGroupId) {
-        this.classGroupId = classGroupId;
-    }
-
-    public String getClassGroupName() {
-        return classGroupName;
-    }
-
-    public void setClassGroupName(String classGroupName) {
-        this.classGroupName = classGroupName;
-    }
-
-    public String getTeachMode() {
-        return teachMode;
-    }
-
-    public void setTeachMode(String teachMode) {
-        this.teachMode = teachMode;
-    }
-
-    public String getHeadUrl() {
-        return headUrl;
-    }
-
-    public void setHeadUrl(String headUrl) {
-        this.headUrl = headUrl;
-    }
-
-    public Date getExpiryDate() {
-        return expiryDate;
-    }
-
-    public void setExpiryDate(Date expiryDate) {
-        this.expiryDate = expiryDate;
-    }
-
-    public Integer getStudentCourseHomeworkId() {
-        return studentCourseHomeworkId;
-    }
-
-    public void setStudentCourseHomeworkId(Integer studentCourseHomeworkId) {
-        this.studentCourseHomeworkId = studentCourseHomeworkId;
-    }
-
-    public Long getCourseScheduleId() {
-        return courseScheduleId;
-    }
-
-    public void setCourseScheduleId(Long courseScheduleId) {
-        this.courseScheduleId = courseScheduleId;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public Date getStartClassTime() {
-        return startClassTime;
-    }
-
-    public void setStartClassTime(Date startClassTime) {
-        this.startClassTime = startClassTime;
-    }
-
-    public Integer getTeacherId() {
-        return teacherId;
-    }
-
-    public void setTeacherId(Integer teacherId) {
-        this.teacherId = teacherId;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
+    private String memo;
 }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.enums.GroupType;
+import lombok.Data;
 
 import java.util.Date;
 
@@ -8,6 +9,8 @@ import java.util.Date;
  * @Author Joburgess
  * @Date 2020.04.29
  */
+
+@Data
 public class StudentServiceDetailDto {
 
     private Long homeworkId;
@@ -48,155 +51,5 @@ public class StudentServiceDetailDto {
 
     private String musicScoreId;
 
-    public String getMusicScoreId() {
-        return musicScoreId;
-    }
-
-    public void setMusicScoreId(String musicScoreId) {
-        this.musicScoreId = musicScoreId;
-    }
-
-    public Date getCourseEndTime() {
-        return courseEndTime;
-    }
-
-    public void setCourseEndTime(Date courseEndTime) {
-        this.courseEndTime = courseEndTime;
-    }
-
-    public Long getStudentHomeworkId() {
-        return studentHomeworkId;
-    }
-
-    public void setStudentHomeworkId(Long studentHomeworkId) {
-        this.studentHomeworkId = studentHomeworkId;
-    }
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    public GroupType getGroupType() {
-        return groupType;
-    }
-
-    public void setGroupType(GroupType groupType) {
-        this.groupType = groupType;
-    }
-
-    public Integer getIsSubmit() {
-        return isSubmit;
-    }
-
-    public void setIsSubmit(Integer isSubmit) {
-        this.isSubmit = isSubmit;
-    }
-
-    public Long getHomeworkId() {
-        return homeworkId;
-    }
-
-    public void setHomeworkId(Long homeworkId) {
-        this.homeworkId = homeworkId;
-    }
-
-    public String getHomeworkType() {
-        return homeworkType;
-    }
-
-    public void setHomeworkType(String homeworkType) {
-        this.homeworkType = homeworkType;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public Long getCourseScheduleId() {
-        return courseScheduleId;
-    }
-
-    public void setCourseScheduleId(Long courseScheduleId) {
-        this.courseScheduleId = courseScheduleId;
-    }
-
-    public String getGroupName() {
-        return groupName;
-    }
-
-    public void setGroupName(String groupName) {
-        this.groupName = groupName;
-    }
-
-    public Date getCourseStartTime() {
-        return courseStartTime;
-    }
-
-    public void setCourseStartTime(Date courseStartTime) {
-        this.courseStartTime = courseStartTime;
-    }
-
-    public Integer getTeacherId() {
-        return teacherId;
-    }
-
-    public void setTeacherId(Integer teacherId) {
-        this.teacherId = teacherId;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public Date getHomeworkCreateTime() {
-        return homeworkCreateTime;
-    }
-
-    public void setHomeworkCreateTime(Date homeworkCreateTime) {
-        this.homeworkCreateTime = homeworkCreateTime;
-    }
-
-    public Date getSubmitTime() {
-        return submitTime;
-    }
-
-    public void setSubmitTime(Date submitTime) {
-        this.submitTime = submitTime;
-    }
-
-    public Integer getIsReplied() {
-        return isReplied;
-    }
-
-    public void setIsReplied(Integer isReplied) {
-        this.isReplied = isReplied;
-    }
-
-    public String getAttachments() {
-        return attachments;
-    }
-
-    public void setAttachments(String attachments) {
-        this.attachments = attachments;
-    }
+    private String memo;
 }

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

@@ -1,11 +1,14 @@
 package com.ym.mec.biz.dal.dto;
 
+import lombok.Data;
+
 import java.util.Date;
 
 /**
  * @Author Joburgess
  * @Date 2020.04.29
  */
+@Data
 public class StudentServiceHomeworkDto {
 
     private Integer id;
@@ -16,6 +19,8 @@ public class StudentServiceHomeworkDto {
 
     private Integer isReplied;
 
+    private String memo;
+
     private Integer isRepliedTimely;
 
     private Integer isView;
@@ -23,68 +28,4 @@ public class StudentServiceHomeworkDto {
     private Date submitTime;
 
     private String type;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Integer getIsReplied() {
-        return isReplied;
-    }
-
-    public void setIsReplied(Integer isReplied) {
-        this.isReplied = isReplied;
-    }
-
-    public Integer getIsRepliedTimely() {
-        return isRepliedTimely;
-    }
-
-    public void setIsRepliedTimely(Integer isRepliedTimely) {
-        this.isRepliedTimely = isRepliedTimely;
-    }
-
-    public Integer getIsView() {
-        return isView;
-    }
-
-    public void setIsView(Integer isView) {
-        this.isView = isView;
-    }
-
-    public Date getSubmitTime() {
-        return submitTime;
-    }
-
-    public void setSubmitTime(Date submitTime) {
-        this.submitTime = submitTime;
-    }
 }

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

@@ -3,9 +3,11 @@ package com.ym.mec.biz.dal.dto;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.Date;
 
+@Data
 public class StudentVisitCourseHomeWorkDto {
     @ApiModelProperty(value = "课程id",required = false)
     private Long courseScheduleId;
@@ -28,6 +30,8 @@ public class StudentVisitCourseHomeWorkDto {
     @ApiModelProperty(value = "作业内容",required = false)
     private String content;
 
+    private String memo;
+
     @ApiModelProperty(value = "提交状态",required = false)
     private YesOrNoEnum status;
 
@@ -39,92 +43,4 @@ public class StudentVisitCourseHomeWorkDto {
 
     @ApiModelProperty(value = "布置时间")
     private Date createTime;
-
-    public GroupType getGroupType() {
-        return groupType;
-    }
-
-    public void setGroupType(GroupType groupType) {
-        this.groupType = groupType;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getGroupName() {
-        return groupName;
-    }
-
-    public void setGroupName(String groupName) {
-        this.groupName = groupName;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    public Long getCourseScheduleId() {
-        return courseScheduleId;
-    }
-
-    public void setCourseScheduleId(Long courseScheduleId) {
-        this.courseScheduleId = courseScheduleId;
-    }
-
-    public YesOrNoEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(YesOrNoEnum status) {
-        this.status = status;
-    }
-
-    public YesOrNoEnum getIsReplied() {
-        return isReplied;
-    }
-
-    public void setIsReplied(YesOrNoEnum isReplied) {
-        this.isReplied = isReplied;
-    }
-
-    public YesOrNoEnum getIsView() {
-        return isView;
-    }
-
-    public void setIsView(YesOrNoEnum isView) {
-        this.isView = isView;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
 }

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

@@ -63,6 +63,4 @@ public class TeacherHomeworkListDto {
     private int isSubmit;
 
     private int status;
-
-    private String memo;
 }

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

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

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

@@ -110,6 +110,7 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
         studentExtraExercise.setIsView(0);
         studentExtraExercise.setIsRepliedTimely(0);
         studentExtraExercise.setMusicScoreId(exercises.getMusicScoreId());
+        studentExtraExercise.setMemo(exercises.getMemo());
 
         List<ExtracurricularExercisesReply> extracurricularExercisesReplies = new ArrayList<>();
 

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

@@ -445,6 +445,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 					}
                     for (StudentCourseHomework studentCourseHomework : studentCourseHomeworks) {
                         studentCourseHomework.setGroupType(teacherAttendance.getGroupType());
+						studentCourseHomework.setMemo(courseHomeworkInfo.getMemo());
                     }
 
                     if (!CollectionUtils.isEmpty(studentLessonTrainingDetails)) {

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

@@ -66,10 +66,10 @@
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.CourseHomework" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO course_homework (group_type_,course_schedule_id_,attachments_,
 		                             title_,content_,create_time_,update_time_,music_group_id_,
-		                             class_group_id_,completed_num_,expect_num_,expiry_date_,tenant_id_,memo_)
+		                             class_group_id_,completed_num_,expect_num_,expiry_date_,tenant_id_)
 		VALUES(#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		       #{courseScheduleId},#{attachments},#{title},#{content},now(),now(),#{musicGroupId},
-		       #{classGroupId},#{completedNum},#{expectNum},#{expiryDate},#{tenantId},#{memo})
+		       #{classGroupId},#{completedNum},#{expectNum},#{expiryDate},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -97,9 +97,6 @@
 			<if test="title != null">
 				title_ = #{title},
 			</if>
-			<if test="memo != null">
-				memo_ = #{memo},
-			</if>
 			<if test="content != null">
 				content_ = #{content},
 			</if>
@@ -177,7 +174,6 @@
 		<result property="homeworkId" column="homework_id_"/>
 		<result property="content" column="content_"/>
 		<result property="title" column="title_"/>
-		<result property="memo" column="memo_"/>
 		<result property="expectNum" column="expect_num_"/>
 		<result property="completedNum" column="completed_num_"/>
 		<result property="courseScheduleName" column="course_schedule_name_"/>
@@ -190,7 +186,6 @@
 		<result property="startClassTime" column="start_class_time_"/>
 		<result property="endClassTime" column="end_class_time_"/>
 		<result property="expiryDate" column="expiry_date_"/>
-		<result property="memo" column="memo_"/>
 	</resultMap>
 
 	<select id="findByClassGroupAndTeacher" resultMap="teacherHomeworkListDto">
@@ -198,7 +193,6 @@
 			cs.id_ course_schedule_id_,
 			ch.content_,
 			ch.title_,
-			ch.memo_,
 			ch.create_time_,
 			DATE_FORMAT(cs.class_date_,'%Y-%m-%d') 'day_',
 			CONCAT( class_date_, ' ', start_class_time_ ) start_class_time_,
@@ -286,6 +280,7 @@
 		<result property="organId" column="organ_id_"/>
 		<result property="groupType" column="group_type_"/>
 		<result property="groupName" column="group_name_"/>
+		<result property="memo" column="memo_"/>
 		<result property="groupId" column="group_id_"/>
 		<result property="courseScheduleName" column="course_schedule_name_"/>
 		<result property="courseScheduleId" column="course_schedule_id_"/>
@@ -302,7 +297,7 @@
 		<result property="versionTag" column="versionTag"/>
 	</resultMap>
     <select id="queryHomePage" resultMap="WebCourseHomeworkListDtoMap">
-		SELECT ch.id_,cs.id_ course_schedule_id_,cs.name_ course_schedule_name_,ch.memo_,
+		SELECT ch.id_,cs.id_ course_schedule_id_,cs.name_ course_schedule_name_,sch.memo_,
 		cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.organ_id_,o.name_ organ_name_,
 		mg.id_ group_id_,mg.name_ group_name_,ch.create_time_,cs.actual_teacher_id_,
 		su.real_name_ actual_teacher_name_,ch.completed_num_,ch.expect_num_,cs.group_type_,
@@ -374,7 +369,7 @@
 	<select id="findByIdList" resultMap="teacherHomeworkListDto">
 		SELECT
 		ch.id_ homework_id_,ch.title_,ch.content_,ch.completed_num_,ch.expect_num_,ch.expiry_date_,
-		ch.course_schedule_id_,ch.music_group_id_,ch.memo_,
+		ch.course_schedule_id_,ch.music_group_id_,
 		DATE_FORMAT(ch.create_time_,'%Y-%m-%d') 'day_',
 		CONCAT(cs.class_date_, ' ',cs.start_class_time_ ) start_class_time_,
 		CONCAT(cs.class_date_, ' ',cs.end_class_time_ ) end_class_time_,

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

@@ -101,9 +101,9 @@
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercises" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO extracurricular_exercises (music_group_id_,teacher_id_,student_id_list_,batch_no_,
 		                                       title_,attachments_,content_,expire_date_,completed_num_,expect_num_,
-		                                       create_time_,update_time_,tenant_id_,group_type_,memo_)
+		                                       create_time_,update_time_,tenant_id_,group_type_)
 		VALUES(#{musicGroupId},#{teacherId},#{studentIdList},#{batchNo},#{title},#{attachments},
-		       #{content},#{expireDate},#{completedNum},#{expectNum},NOW(), NOW(),#{tenantId},#{groupType},#{memo})
+		       #{content},#{expireDate},#{completedNum},#{expectNum},NOW(), NOW(),#{tenantId},#{groupType})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -143,9 +143,6 @@
             <if test="versionTag != null and versionTag != ''">
                 version_tag_ = #{versionTag},
             </if>
-			<if test="memo != null and memo != ''">
-				memo_ = #{memo},
-			</if>
 			update_time_ = NOW()
 		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
@@ -158,7 +155,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_,ee.memo_,
+		       ee.content_,ee.expire_date_,ee.completed_num_,ee.expect_num_,ee.create_time_,ee.update_time_,ee.tenant_id_,eer.memo_,
 		     ,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_
@@ -338,7 +335,7 @@
 		</where>) h
 	</select>
 	<select id="findByIdList" resultMap="com.ym.mec.biz.dal.dao.CourseHomeworkDao.teacherHomeworkListDto">
-		SELECT id_ homework_id_,title_,content_,completed_num_,expect_num_,music_score_id_,memo_,
+		SELECT id_ homework_id_,title_,content_,completed_num_,expect_num_,music_score_id_,
 		       expire_date_ expiry_date_,DATE_FORMAT(create_time_,'%Y-%m-%d') 'day_'
 		FROM extracurricular_exercises WHERE id_ IN
 		<foreach collection="exercisesIdList" separator="," item="item" open="(" close=")">

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

@@ -14,6 +14,7 @@
 		<result column="username_" property="user.username" />
 		<result column="attachments_" property="attachments" />
 		<result column="create_time_" property="createTime" />
+		<result column="memo_" property="memo" />
 		<result column="update_time_" property="updateTime" />
 		<result column="remark_" property="remark" />
 		<result column="status_" property="status" />
@@ -35,6 +36,7 @@
 		<result column="teacher_name_" property="teacherName"/>
 		<result column="avatar_" property="headUrl"/>
 		<result column="phone_" property="phone"/>
+		<result column="memo_" property="memo"/>
 		<result column="title_" property="title"/>
 		<result column="content_" property="content"/>
 		<result column="expire_date_" property="expireDate"/>
@@ -101,20 +103,21 @@
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO extracurricular_exercises_reply (extracurricular_exercises_id_,user_id_,attachments_,create_time_,
 		                                             update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,
-		                                             music_score_id_,music_score_content_,tenant_id_,standard_flag_)
+		                                             music_score_id_,music_score_content_,tenant_id_,standard_flag_,memo_)
 		VALUES(#{extracurricularExercisesId},#{userId},#{attachments},NOW(),NOW(),#{remark},#{status},#{isReplied},#{isView},
-		       #{isRepliedTimely},#{musicScoreId},#{musicScoreContent},#{tenantId},#{standardFlag})
+		       #{isRepliedTimely},#{musicScoreId},#{musicScoreContent},#{tenantId},#{standardFlag},#{memo})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO extracurricular_exercises_reply (extracurricular_exercises_id_,user_id_,attachments_,
 		                                             create_time_,update_time_,remark_,status_,is_replied_,is_view_,
-		                                             is_replied_timely_,music_score_id_,music_score_content_,tenant_id_,standard_flag_)
+		                                             is_replied_timely_,music_score_id_,music_score_content_,tenant_id_,standard_flag_,memo_)
 		VALUES
 		<foreach collection="replies" item="reply" separator=",">
 			(#{reply.extracurricularExercisesId},#{reply.userId},#{reply.attachments},NOW(),NOW(),
 			 #{reply.remark},#{reply.status},#{reply.isReplied},#{reply.isView},#{reply.isRepliedTimely},
-			 #{reply.musicScoreId},#{reply.musicScoreContent},#{replay.tenantId},#{replay.standardFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+			 #{reply.musicScoreId},#{reply.musicScoreContent},#{replay.tenantId},
+			 #{replay.standardFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{reply.memo})
 		</foreach>
 	</insert>
 
@@ -143,6 +146,9 @@
 			<if test="remark != null">
 			remark_ = #{remark},
 			</if>
+			<if test="memo != null">
+				memo_ = #{memo},
+			</if>
 			<if test="id != null">
 			id_ = #{id},
 			</if>
@@ -401,6 +407,7 @@
 		<result column="id_" property="id" />
 		<result column="user_id_" property="userId" />
 		<result column="status_" property="status" />
+		<result column="memo_" property="memo" />
 		<result column="is_replied_" property="isReplied" />
 		<result column="is_replied_timely_" property="isRepliedTimely" />
 		<result column="is_view_" property="isView" />
@@ -416,6 +423,7 @@
 			eer.submit_time_,
 			eer.is_replied_,
 			eer.is_replied_timely_,
+			eer.memo_,
 			'EXTRA' type_
 		FROM
 			extracurricular_exercises_reply eer
@@ -429,6 +437,7 @@
 			sch.submit_time_,
 			sch.is_replied_,
 			sch.is_replied_timely_,
+			sch.memo_,
 			'HOMEWORK' type_
 		FROM
 			student_course_homework sch
@@ -457,6 +466,7 @@
 		<result property="isReplied" column="is_replied_"/>
 		<result property="attachments" column="attachments_"/>
 		<result property="musicScoreId" column="music_score_id_"/>
+		<result property="memo" column="memo_"/>
 	</resultMap>
 
 	<select id="findStudentHomeworkDetailsInTimeZone" resultMap="StudentServiceDetailDto">
@@ -479,6 +489,7 @@
 			eer.attachments_,
 			eer.submit_time_,
 			eer.is_replied_,
+			eer.memo_,
 			'EXTRA' homework_type_
 		FROM
 			extracurricular_exercises_reply eer
@@ -506,6 +517,7 @@
 			sch.attachments_,
 			sch.submit_time_,
 			sch.is_replied_,
+			sch.memo_,
 			'HOMEWORK' homework_type_
 		FROM
 			student_course_homework sch
@@ -546,6 +558,7 @@
 			eer.is_replied_timely_,
 			ee.teacher_id_ ee_teacher_id_,
 			eer.music_score_id_,
+			eer.memo_,
 			ee.music_group_id_ ee_music_group_id_
 		FROM
 			extracurricular_exercises_reply eer
@@ -594,7 +607,8 @@
 			COUNT( eer.user_id_ ) exceptStudentNum,
 			SUM( eer.status_ ) submitStudentNum,
 			SUM( eer.is_replied_ ) repliedStudentNum,
-			eer.music_score_id_ musicScoreId
+			eer.music_score_id_ musicScoreId,
+			eer.memo_ memo
 		FROM
 			extracurricular_exercises ee
 			LEFT JOIN sys_user su ON ee.teacher_id_ = su.id_

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

@@ -40,6 +40,7 @@
         <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"/>
@@ -90,7 +91,8 @@
             keyColumn="id" keyProperty="id">
         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_)
+         update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,music_score_id_,
+         music_score_content_,tenant_id_,standard_flag_,group_type_,memo_)
         VALUE
         <foreach collection="list" item="homework" separator=",">
             (#{homework.userId},#{homework.courseScheduleId},#{homework.courseHomeworkId},#{homework.attachments},
@@ -99,7 +101,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.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{homework.memo})
         </foreach>
     </insert>
 
@@ -132,6 +134,9 @@
             <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>
@@ -162,6 +167,7 @@
         <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"/>
@@ -204,6 +210,7 @@
     <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_,
@@ -253,7 +260,8 @@
                sch.is_replied_,
                sch.course_schedule_id_,
                sch.standard_flag_,
-               sch.submit_time_
+               sch.submit_time_,
+               sch.memo_
         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_
@@ -339,6 +347,7 @@
         <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"/>
@@ -346,7 +355,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_,
+        SELECT sch.id_ student_course_homework_id_,sch.attachments_,sch.is_replied_,sch.is_view_,sch.memo_,
         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_ =
@@ -363,6 +372,7 @@
         <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_"/>
@@ -381,6 +391,7 @@
         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_,
@@ -529,6 +540,7 @@
         <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"/>
@@ -544,7 +556,8 @@
         ch.content_ content,
         sch.status_ status,
         sch.is_replied_ isReplied,
-        sch.is_view_ isView
+        sch.is_view_ isView,
+        sch.memo_
         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_
@@ -588,7 +601,8 @@
             COUNT( sch.user_id_ ) exceptStudentNum,
             SUM( sch.status_ ) submitStudentNum,
             SUM( sch.is_replied_ ) repliedStudentNum,
-            sch.music_score_id_ musicScoreId
+            sch.music_score_id_ musicScoreId,
+            sch.memo_ memo
         FROM
             course_homework ch
             LEFT JOIN music_group mg ON mg.id_ = ch.music_group_id_
@@ -710,7 +724,6 @@
     <select id="findStudentCourseHomeworkByCourse" resultMap="StudentCourseHomework">
         SELECT
         sch.*,
-        ch.memo_,
         su.username_,
         su.avatar_,
         su.phone_,