Ver código fonte

新增训练说明

zouxuan 7 meses atrás
pai
commit
0dafc07302

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

@@ -1,15 +1,9 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.dto.StudentLessonTrainingDetailWrapper;
-import com.ym.mec.biz.dal.enums.ELessonTrainingType;
-import com.ym.mec.biz.dal.enums.GroupType;
-import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
-import com.ym.mec.biz.dal.enums.StandardEnum;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.common.entity.BaseEntity;
-
 import io.swagger.annotations.ApiModelProperty;
-
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -117,29 +111,7 @@ public class StudentCourseHomework extends BaseEntity {
 	@ApiModelProperty(value = "是否已查看")
 	private YesOrNoEnum isView;
 
-	public Integer getIsRepliedTimely() {
-		return isRepliedTimely;
-	}
-
-	public void setIsRepliedTimely(Integer isRepliedTimely) {
-		this.isRepliedTimely = isRepliedTimely;
-	}
-
-	public YesOrNoEnum getIsView() {
-		return isView;
-	}
-
-	public void setIsView(YesOrNoEnum isView) {
-		this.isView = isView;
-	}
-
-	public YesOrNoEnum getIsReplied() {
-		return isReplied;
-	}
-
-	public void setIsReplied(YesOrNoEnum isReplied) {
-		this.isReplied = isReplied;
-	}
+	private String memo;
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -83,6 +83,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 			studentCourseHomework.setIsView(extraExerciseStudent.getIsView()==0?YesOrNoEnum.NO:YesOrNoEnum.YES);
 			studentCourseHomework.setAvatar(extraExerciseStudent.getHeadUrl());
             studentCourseHomework.setType(ELessonTrainingType.valueOf(extracurricularExercises.getGroupType()));
+			studentCourseHomework.setMemo(extracurricularExercises.getMemo());
             studentCourseHomeworks.add(studentCourseHomework);
 		}
 		return studentCourseHomeworks;

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

@@ -29,6 +29,7 @@
         <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>
 
@@ -709,6 +710,7 @@
     <select id="findStudentCourseHomeworkByCourse" resultMap="StudentCourseHomework">
         SELECT
         sch.*,
+        ch.memo_,
         su.username_,
         su.avatar_,
         su.phone_,