新增训练说明

mec-application/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -2118,7 +2118,7 @@ public class ExportController extends BaseController {
         }
 
         try {
-            String[] header = {"分部", "老师编号", "老师姓名", "服务周期", "课后训练(节)", "课后训练(人)", "课外训练(人)", "预计训练布置(人次)", "实际训练布置(人次)", "提交次数", "评价次数", "及时评价次数", "及时评价率", "作业点评率",
+            String[] header = {"分部", "老师编号", "老师姓名", "服务周期", "课后训练(节)", "课后训练(人)", "课外训练(人)", "预计训练布置(人次)", "实际训练布置(人次)", "提交次数", "评价次数", "及时评价次数", "及时评价率", "训练点评率",
                     "训练布置", "训练点评", "训练提交率",
                     "提醒时间", "操作人"};
             String[] body = {"organName", "teacherId", "teacherName", "dateRange", "homeworkNum", "homeworkStuNum", "exerciseNum", "expectExercisesNum", "actualExercisesNum", "exercisesReplyNum", "exercisesMessageNum", "exercisesMessageTimelyNum", "exercisesMessageTimelyRate", "exercisesMessageRate",

mec-application/src/main/java/com/ym/mec/web/controller/education/CourseHomeworkTemplateController.java

@@ -45,7 +45,7 @@ public class CourseHomeworkTemplateController extends BaseController {
     @PostMapping("/update")
     public Object update(CourseHomeworkTemplate courseHomeworkTemplate){
         if(Objects.isNull(courseHomeworkTemplate.getId())){
-            return failed("请指定作业模板");
+            return failed("请指定训练模板");
         }
         courseHomeworkTemplateService.update(courseHomeworkTemplate);
         return succeed();

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

@@ -3,13 +3,11 @@ package com.ym.mec.biz.dal.dto;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.Date;
 
-/**
- * @Author Joburgess
- * @Date 2019/9/19
- */
+@Data
 public class CourseHomeworkListDto {
 
     /**  */
@@ -24,6 +22,8 @@ public class CourseHomeworkListDto {
     /** 作业内容 */
     private String title;
 
+    private String memo;
+
     /**  */
     private java.util.Date createTime;
 
@@ -71,156 +71,4 @@ public class CourseHomeworkListDto {
 
     @ApiModelProperty(value = "实际上课老师头像",required = false)
     private String headUrl;
-
-    public Integer getTeacherId() {
-        return teacherId;
-    }
-
-    public void setTeacherId(Integer teacherId) {
-        this.teacherId = teacherId;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public String getHeadUrl() {
-        return headUrl;
-    }
-
-    public void setHeadUrl(String headUrl) {
-        this.headUrl = headUrl;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getCourseScheduleId() {
-        return courseScheduleId;
-    }
-
-    public void setCourseScheduleId(Long courseScheduleId) {
-        this.courseScheduleId = courseScheduleId;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getExpiryDate() {
-        return expiryDate;
-    }
-
-    public void setExpiryDate(Date expiryDate) {
-        this.expiryDate = expiryDate;
-    }
-
-    public Date getStartClassTime() {
-        return startClassTime;
-    }
-
-    public void setStartClassTime(Date startClassTime) {
-        this.startClassTime = startClassTime;
-    }
-
-    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 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 Integer getCompletedNum() {
-        return completedNum;
-    }
-
-    public void setCompletedNum(Integer completedNum) {
-        this.completedNum = completedNum;
-    }
-
-    public Integer getExpectNum() {
-        return expectNum;
-    }
-
-    public void setExpectNum(Integer expectNum) {
-        this.expectNum = expectNum;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    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;
-    }
 }

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

@@ -1,76 +1,29 @@
 package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.List;
 
+@Data
 public class MusicScoreSubjectDto {
 
-//    @ApiModelProperty(value = "声部",required = false)
-//    private Integer subjectId;
-
     @ApiModelProperty(value = "学员编号",required = false)
     private List<Integer> userIdList;
 
-
     @ApiModelProperty(value = "分组号")
     private Integer group;
 
+    @ApiModelProperty(value = "训练说明",required = false)
+    private String memo;
+
     @ApiModelProperty(value = "曲目编号（兼容旧数据）",required = false)
     private List<Integer> musicScoreIdList;
 
     @ApiModelProperty(value = "曲目编号、分谱（新版布置作业需要）",required = false)
     private List<MusicScoreHomeworkDto> musicScoreHomeworkDtoList;
 
-
     @ApiModelProperty("新版作业 time:2023-03-31")
     private List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails;
 
-    public List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> getStudentLessonTrainingDetails() {
-        return studentLessonTrainingDetails;
-    }
-
-    public void setStudentLessonTrainingDetails(List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails) {
-        this.studentLessonTrainingDetails = studentLessonTrainingDetails;
-    }
-
-    public List<MusicScoreHomeworkDto> getMusicScoreHomeworkDtoList() {
-        return musicScoreHomeworkDtoList;
-    }
-
-    public void setMusicScoreHomeworkDtoList(List<MusicScoreHomeworkDto> musicScoreHomeworkDtoList) {
-        this.musicScoreHomeworkDtoList = musicScoreHomeworkDtoList;
-    }
-
-//    public Integer getSubjectId() {
-//        return subjectId;
-//    }
-//
-//    public void setSubjectId(Integer subjectId) {
-//        this.subjectId = subjectId;
-//    }
-
-    public List<Integer> getUserIdList() {
-        return userIdList;
-    }
-
-    public void setUserIdList(List<Integer> userIdList) {
-        this.userIdList = userIdList;
-    }
-
-    public List<Integer> getMusicScoreIdList() {
-        return musicScoreIdList;
-    }
-
-    public void setMusicScoreIdList(List<Integer> musicScoreIdList) {
-        this.musicScoreIdList = musicScoreIdList;
-    }
-
-    public Integer getGroup() {
-        return group;
-    }
-
-    public void setGroup(Integer group) {
-        this.group = group;
-    }
 }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
 import java.util.Date;
@@ -9,6 +10,7 @@ import java.util.Date;
  * @Author Joburgess
  * @Date 2019/10/20
  */
+@Data
 public class TeacherHomeworkListDto {
 
     @ApiModelProperty(value = "课程编号")
@@ -62,155 +64,5 @@ public class TeacherHomeworkListDto {
 
     private int status;
 
-    public Integer getHomeworkId() {
-        return homeworkId;
-    }
-
-    public void setHomeworkId(Integer homeworkId) {
-        this.homeworkId = homeworkId;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public Date getEndClassTime() {
-        return endClassTime;
-    }
-
-    public void setEndClassTime(Date endClassTime) {
-        this.endClassTime = endClassTime;
-    }
-
-    public Date getExpiryDate() {
-        return expiryDate;
-    }
-
-    public void setExpiryDate(Date expiryDate) {
-        this.expiryDate = expiryDate;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public Date getStartClassTime() {
-        return startClassTime;
-    }
-
-    public void setStartClassTime(Date startClassTime) {
-        this.startClassTime = startClassTime;
-    }
-
-    public int getIsSubmit() {
-        return isSubmit;
-    }
-
-    public void setIsSubmit(int isSubmit) {
-        this.isSubmit = isSubmit;
-    }
-
-    public int getIsReplied() {
-        return isReplied;
-    }
-
-    public void setIsReplied(int isReplied) {
-        this.isReplied = isReplied;
-    }
-
-    public String getDay() {
-        return day;
-    }
-
-    public void setDay(String day) {
-        this.day = day;
-    }
-
-    public Integer getCourseScheduleId() {
-        return courseScheduleId;
-    }
-
-    public void setCourseScheduleId(Integer courseScheduleId) {
-        this.courseScheduleId = courseScheduleId;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Integer getExpectNum() {
-        return expectNum;
-    }
-
-    public void setExpectNum(Integer expectNum) {
-        this.expectNum = expectNum;
-    }
-
-    public Integer getCompletedNum() {
-        return completedNum;
-    }
-
-    public void setCompletedNum(Integer completedNum) {
-        this.completedNum = completedNum;
-    }
-
-    public String getCourseScheduleName() {
-        return courseScheduleName;
-    }
-
-    public void setCourseScheduleName(String courseScheduleName) {
-        this.courseScheduleName = courseScheduleName;
-    }
-
-    public Integer getTotalClassTimes() {
-        return totalClassTimes;
-    }
-
-    public void setTotalClassTimes(Integer totalClassTimes) {
-        this.totalClassTimes = totalClassTimes;
-    }
-
-    public Integer getCurrentClassTimes() {
-        return currentClassTimes;
-    }
-
-    public void setCurrentClassTimes(Integer currentClassTimes) {
-        this.currentClassTimes = currentClassTimes;
-    }
-
-    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;
-    }
+    private String memo;
 }

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

@@ -2,13 +2,11 @@ package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.enums.GroupType;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.Date;
 
-/**
- * @Author Joburgess
- * @Date 2019/9/19
- */
+@Data
 public class WebCourseHomeworkListDto {
 
     @ApiModelProperty(value = "作业编号",required = false)
@@ -73,171 +71,5 @@ public class WebCourseHomeworkListDto {
 
     private String versionTag;
 
-    public String getVersionTag() {
-        return versionTag;
-    }
-
-    public void setVersionTag(String versionTag) {
-        this.versionTag = versionTag;
-    }
-
-    public Date getExpiryDate() {
-        return expiryDate;
-    }
-
-    public void setExpiryDate(Date expiryDate) {
-        this.expiryDate = expiryDate;
-    }
-
-    public String getMusicGroupName() {
-        return musicGroupName;
-    }
-
-    public void setMusicGroupName(String musicGroupName) {
-        this.musicGroupName = musicGroupName;
-    }
-
-    public String getMusicScoreId() {
-        return musicScoreId;
-    }
-
-    public void setMusicScoreId(String musicScoreId) {
-        this.musicScoreId = musicScoreId;
-    }
-
-    public String getClassDate() {
-        return classDate;
-    }
-
-    public void setClassDate(String classDate) {
-        this.classDate = classDate;
-    }
-
-    public String getClassStartDate() {
-        return classStartDate;
-    }
-
-    public void setClassStartDate(String classStartDate) {
-        this.classStartDate = classStartDate;
-    }
-
-    public String getClassEndDate() {
-        return classEndDate;
-    }
-
-    public void setClassEndDate(String classEndDate) {
-        this.classEndDate = classEndDate;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getCourseScheduleId() {
-        return courseScheduleId;
-    }
-
-    public void setCourseScheduleId(Long courseScheduleId) {
-        this.courseScheduleId = courseScheduleId;
-    }
-
-    public String getCourseScheduleName() {
-        return courseScheduleName;
-    }
-
-    public void setCourseScheduleName(String courseScheduleName) {
-        this.courseScheduleName = courseScheduleName;
-    }
-
-    public Integer getOrganId() {
-        return organId;
-    }
-
-    public void setOrganId(Integer organId) {
-        this.organId = organId;
-    }
-
-    public String getOrganName() {
-        return organName;
-    }
-
-    public void setOrganName(String organName) {
-        this.organName = organName;
-    }
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    public String getGroupName() {
-        return groupName;
-    }
-
-    public void setGroupName(String groupName) {
-        this.groupName = groupName;
-    }
-
-    public GroupType getGroupType() {
-        return groupType;
-    }
-
-    public void setGroupType(GroupType groupType) {
-        this.groupType = groupType;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Integer getActualTeacherId() {
-        return actualTeacherId;
-    }
-
-    public void setActualTeacherId(Integer actualTeacherId) {
-        this.actualTeacherId = actualTeacherId;
-    }
-
-    public String getActualTeacherName() {
-        return actualTeacherName;
-    }
-
-    public void setActualTeacherName(String actualTeacherName) {
-        this.actualTeacherName = actualTeacherName;
-    }
-
-    public Integer getCompletedNum() {
-        return completedNum;
-    }
-
-    public void setCompletedNum(Integer completedNum) {
-        this.completedNum = completedNum;
-    }
-
-    public Integer getExpectNum() {
-        return expectNum;
-    }
-
-    public void setExpectNum(Integer expectNum) {
-        this.expectNum = expectNum;
-    }
-
-    public Integer getRepliedNum() {
-        return repliedNum;
-    }
-
-    public void setRepliedNum(Integer repliedNum) {
-        this.repliedNum = repliedNum;
-    }
+    private String memo;
 }

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

@@ -2,14 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.dto.LessonExaminationSaveDto;
 import com.ym.mec.biz.dal.dto.MusicScoreSubjectDto;
-
 import com.ym.mec.biz.dal.dto.StudentLessonTrainingDetailWrapper;
-import io.swagger.annotations.ApiModelProperty;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Date;
 import java.util.List;
@@ -17,6 +15,7 @@ import java.util.List;
 /**
  * 对应数据库表(course_homework):
  */
+@Data
 public class CourseHomework extends BaseEntity {
 
 	/**  */
@@ -37,6 +36,8 @@ public class CourseHomework extends BaseEntity {
 
 	/** 作业内容 */
 	private String title;
+
+	private String memo;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -76,174 +77,6 @@ public class CourseHomework extends BaseEntity {
 	@ApiModelProperty(value = "课后评测信息")
 	private LessonExaminationSaveDto lessonExaminationSaveDto;
 
-	public LessonExaminationSaveDto getLessonExaminationSaveDto() {
-		return lessonExaminationSaveDto;
-	}
-
-    public Boolean getPushFlag() {
-        return pushFlag;
-    }
-
-    public void setPushFlag(Boolean pushFlag) {
-        this.pushFlag = pushFlag;
-    }
-
-    public void setLessonExaminationSaveDto(LessonExaminationSaveDto lessonExaminationSaveDto) {
-		this.lessonExaminationSaveDto = lessonExaminationSaveDto;
-	}
-
-	public List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> getStudentLessonTrainingDetails() {
-        return studentLessonTrainingDetails;
-    }
-
-    public void setStudentLessonTrainingDetails(List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails) {
-        this.studentLessonTrainingDetails = studentLessonTrainingDetails;
-    }
-
-    public String getVersionTag() {
-        return versionTag;
-    }
-
-    public void setVersionTag(String versionTag) {
-        this.versionTag = versionTag;
-    }
-
-    public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public List<MusicScoreSubjectDto> getMusicScoreSubjectDto() {
-		return musicScoreSubjectDto;
-	}
-
-	public void setMusicScoreSubjectDto(List<MusicScoreSubjectDto> musicScoreSubjectDto) {
-		this.musicScoreSubjectDto = musicScoreSubjectDto;
-	}
-
-	public String getMusicScoreId() {
-		return musicScoreId;
-	}
-
-	public void setMusicScoreId(String musicScoreId) {
-		this.musicScoreId = musicScoreId;
-	}
-
-	public Date getExpiryDate() {
-		return expiryDate;
-	}
-
-	public void setExpiryDate(Date expiryDate) {
-		this.expiryDate = expiryDate;
-	}
-
-	public Integer getCompletedNum() {
-		return completedNum;
-	}
-
-	public void setCompletedNum(Integer completedNum) {
-		this.completedNum = completedNum;
-	}
-
-	public Integer getExpectNum() {
-		return expectNum;
-	}
-
-	public void setExpectNum(Integer expectNum) {
-		this.expectNum = expectNum;
-	}
-
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public GroupType getGroupType() {
-		return groupType;
-	}
-
-	public void setGroupType(GroupType groupType) {
-		this.groupType = groupType;
-	}
-
-	public void setCourseScheduleId(Long courseScheduleId){
-		this.courseScheduleId = courseScheduleId;
-	}
-	
-	public Long getCourseScheduleId(){
-		return this.courseScheduleId;
-	}
-
-	public String getAttachments() {
-		return attachments;
-	}
-
-	public void setAttachments(String attachments) {
-		this.attachments = attachments;
-	}
-
-	public void setContent(String content){
-		this.content = content;
-	}
-	
-	public String getContent(){
-		return this.content;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	public void setMusicGroupId(String musicGroupId){
-		this.musicGroupId = musicGroupId;
-	}
-	
-	public String getMusicGroupId(){
-		return this.musicGroupId;
-	}
-			
-	public void setClassGroupId(Integer classGroupId){
-		this.classGroupId = classGroupId;
-	}
-	
-	public Integer getClassGroupId(){
-		return this.classGroupId;
-	}
-			
-	public MusicGroup getMusicGroup() {
-		return musicGroup;
-	}
-
-	public void setMusicGroup(MusicGroup musicGroup) {
-		this.musicGroup = musicGroup;
-	}
-
-	public ClassGroup getClassGroup() {
-		return classGroup;
-	}
-
-	public void setClassGroup(ClassGroup classGroup) {
-		this.classGroup = classGroup;
-	}
-
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import com.ym.mec.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import javax.validation.constraints.NotNull;
@@ -17,6 +18,7 @@ import java.util.List;
 /**
  * 对应数据库表(extracurricular_exercises):
  */
+@Data
 public class ExtracurricularExercises extends BaseEntity {
 
 	/**  */
@@ -49,6 +51,9 @@ public class ExtracurricularExercises extends BaseEntity {
 	/** 标题 */
 	@ApiModelProperty(value="标题")
 	private String title;
+
+	@ApiModelProperty(value = "训练说明",required = false)
+	private String memo;
 	
 	/** 附件地址（多个用逗号分隔） */
 	@ApiModelProperty(value="附件地址（多个用逗号分隔）")
@@ -114,254 +119,6 @@ public class ExtracurricularExercises extends BaseEntity {
     @ApiModelProperty("新版作业 time:2023-03-31")
     private List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails;
 
-    public Boolean getPushFlag() {
-        return pushFlag;
-    }
-
-    public void setPushFlag(Boolean pushFlag) {
-        this.pushFlag = pushFlag;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getVersionTag() {
-        return versionTag;
-    }
-
-    public void setVersionTag(String versionTag) {
-        this.versionTag = versionTag;
-    }
-
-    public String getMusicGroupName() {
-        return musicGroupName;
-    }
-
-    public void setMusicGroupName(String musicGroupName) {
-        this.musicGroupName = musicGroupName;
-    }
-
-    public String getClassGroupName() {
-        return classGroupName;
-    }
-
-    public void setClassGroupName(String classGroupName) {
-        this.classGroupName = classGroupName;
-    }
-
-    public Date getAssignTime() {
-        return assignTime;
-    }
-
-    public void setAssignTime(Date assignTime) {
-        this.assignTime = assignTime;
-    }
-
-    public Integer getClassGroupId() {
-        return classGroupId;
-    }
-
-    public void setClassGroupId(Integer classGroupId) {
-        this.classGroupId = classGroupId;
-    }
-
-    public String getGroupType() {
-        return groupType;
-    }
-
-    public void setGroupType(String groupType) {
-        this.groupType = groupType;
-    }
-
-    public List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> getStudentLessonTrainingDetails() {
-        return studentLessonTrainingDetails;
-    }
-
-    public void setStudentLessonTrainingDetails(List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails) {
-        this.studentLessonTrainingDetails = studentLessonTrainingDetails;
-    }
-
-	public List<MusicScoreSubjectDto> getMusicScoreSubjectDtos() {
-		return musicScoreSubjectDtos;
-	}
-
-	public void setMusicScoreSubjectDtos(List<MusicScoreSubjectDto> musicScoreSubjectDtos) {
-		this.musicScoreSubjectDtos = musicScoreSubjectDtos;
-	}
-
-	public String getMusicScoreName() {
-		return musicScoreName;
-	}
-
-	public void setMusicScoreName(String musicScoreName) {
-		this.musicScoreName = musicScoreName;
-	}
-
-	public String getMusicScoreId() {
-		return musicScoreId;
-	}
-
-	public void setMusicScoreId(String musicScoreId) {
-		this.musicScoreId = musicScoreId;
-	}
-
-	public ImSendTypeEnum getMsgType() {
-		return msgType;
-	}
-
-	public void setMsgType(ImSendTypeEnum msgType) {
-		this.msgType = msgType;
-	}
-
-	public int getStatus() {
-		return status;
-	}
-
-	public void setStatus(int status) {
-		this.status = status;
-	}
-
-	public int getIsReplied() {
-		return isReplied;
-	}
-
-	public void setIsReplied(int isReplied) {
-		this.isReplied = isReplied;
-	}
-
-	public int getIsSubmit() {
-		return isSubmit;
-	}
-
-	public void setIsSubmit(int isSubmit) {
-		this.isSubmit = isSubmit;
-	}
-
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setTeacherId(Integer teacherId){
-		this.teacherId = teacherId;
-	}
-	
-	public Integer getTeacherId(){
-		return this.teacherId;
-	}
-			
-	public void setStudentIdList(String studentIdList){
-		this.studentIdList = studentIdList;
-	}
-	
-	public String getStudentIdList(){
-		return this.studentIdList;
-	}
-			
-	public void setBatchNo(String batchNo){
-		this.batchNo = batchNo;
-	}
-	
-	public String getBatchNo(){
-		return this.batchNo;
-	}
-			
-	public void setTitle(String title){
-		this.title = title;
-	}
-	
-	public String getTitle(){
-		return this.title;
-	}
-			
-	public void setAttachments(String attachments){
-		this.attachments = attachments;
-	}
-	
-	public String getAttachments(){
-		return this.attachments;
-	}
-			
-	public void setContent(String content){
-		this.content = content;
-	}
-	
-	public String getContent(){
-		return this.content;
-	}
-			
-	public void setExpireDate(java.util.Date expireDate){
-		this.expireDate = expireDate;
-	}
-	
-	public java.util.Date getExpireDate(){
-		return this.expireDate;
-	}
-			
-	public void setCompletedNum(Integer completedNum){
-		this.completedNum = completedNum;
-	}
-	
-	public Integer getCompletedNum(){
-		return this.completedNum;
-	}
-			
-	public void setExpectNum(Integer expectNum){
-		this.expectNum = expectNum;
-	}
-	
-	public Integer getExpectNum(){
-		return this.expectNum;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	public SysUser getTeacher() {
-		return teacher;
-	}
-
-	public void setTeacher(SysUser teacher) {
-		this.teacher = teacher;
-	}
-
-	public String getOrganName() {
-		return organName;
-	}
-
-	public void setOrganName(String organName) {
-		this.organName = organName;
-	}
-
-	public String getMusicGroupId() {
-		return musicGroupId;
-	}
-
-	public void setMusicGroupId(String musicGroupId) {
-		this.musicGroupId = musicGroupId;
-	}
-
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -13,6 +13,7 @@
 		<result column="attachments_" property="attachments" />
 		<result column="title_" property="title" />
 		<result column="content_" property="content" />
+		<result column="memo_" property="memo" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="music_group_id_" property="musicGroupId" />
@@ -30,6 +31,7 @@
 		<result column="course_schedule_id_" property="courseScheduleId" />
 		<result column="title_" property="title" />
 		<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="music_group_id_" property="musicGroupId" />
@@ -63,10 +65,11 @@
 	<!-- 向数据库增加一条记录 -->
 	<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_)
+		                             title_,content_,create_time_,update_time_,music_group_id_,
+		                             class_group_id_,completed_num_,expect_num_,expiry_date_,tenant_id_,memo_)
 		VALUES(#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		       #{courseScheduleId},#{attachments},#{title},#{content},now(),now(),#{musicGroupId},
-		       #{classGroupId},#{completedNum},#{expectNum},#{expiryDate},#{tenantId})
+		       #{classGroupId},#{completedNum},#{expectNum},#{expiryDate},#{tenantId},#{memo})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -88,13 +91,15 @@
 			<if test="groupType != null">
 				group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
-
 			<if test="expectNum != null">
 				expect_num_ = #{expectNum},
 			</if>
 			<if test="title != null">
 				title_ = #{title},
 			</if>
+			<if test="memo != null">
+				memo_ = #{memo},
+			</if>
 			<if test="content != null">
 				content_ = #{content},
 			</if>
@@ -172,6 +177,7 @@
 		<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_"/>
@@ -184,6 +190,7 @@
 		<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">
@@ -191,6 +198,7 @@
 			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_,
@@ -294,10 +302,11 @@
 		<result property="versionTag" column="versionTag"/>
 	</resultMap>
     <select id="queryHomePage" resultMap="WebCourseHomeworkListDtoMap">
-		SELECT ch.id_,cs.id_ course_schedule_id_,cs.name_ course_schedule_name_,
+		SELECT ch.id_,cs.id_ course_schedule_id_,cs.name_ course_schedule_name_,ch.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_,sch.music_score_id_,mg.name_ as musicGroupName,ch.expiry_date_ as expiryDate,ch.version_tag_ as versionTag
+		su.real_name_ actual_teacher_name_,ch.completed_num_,ch.expect_num_,cs.group_type_,
+		sch.music_score_id_,mg.name_ as musicGroupName,ch.expiry_date_ as expiryDate,ch.version_tag_ as versionTag
 		FROM course_homework ch
 		LEFT JOIN student_course_homework sch ON ch.id_ = sch.course_homework_id_
 		LEFT JOIN course_schedule cs ON cs.id_ = ch.course_schedule_id_
@@ -365,7 +374,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.course_schedule_id_,ch.music_group_id_,ch.memo_,
 		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

@@ -31,6 +31,7 @@
 		<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">
@@ -99,9 +100,10 @@
 	<!-- 向数据库增加一条记录 -->
 	<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_)
+		                                       title_,attachments_,content_,expire_date_,completed_num_,expect_num_,
+		                                       create_time_,update_time_,tenant_id_,group_type_,memo_)
 		VALUES(#{musicGroupId},#{teacherId},#{studentIdList},#{batchNo},#{title},#{attachments},
-		       #{content},#{expireDate},#{completedNum},#{expectNum},NOW(), NOW(),#{tenantId},#{groupType})
+		       #{content},#{expireDate},#{completedNum},#{expectNum},NOW(), NOW(),#{tenantId},#{groupType},#{memo})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -141,6 +143,9 @@
             <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>
@@ -153,8 +158,9 @@
 	<!-- 分页查询 -->
 	<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_
-		     ,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
+		       ee.content_,ee.expire_date_,ee.completed_num_,ee.expect_num_,ee.create_time_,ee.update_time_,ee.tenant_id_,ee.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_
 		LEFT JOIN teacher t ON t.id_ = ee.teacher_id_
         left join sys_user su on t.id_ = su.id_
@@ -332,7 +338,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_,
+		SELECT id_ homework_id_,title_,content_,completed_num_,expect_num_,music_score_id_,memo_,
 		       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=")">