Merge remote-tracking branch 'origin/master'

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

@@ -17,6 +17,8 @@ public class ExtraExerciseStudentsDto extends ExtracurricularExercisesReply {
 
     private String teacherName;
 
+    private String headUrl;
+
     private String title;
 
     private String content;
@@ -33,6 +35,14 @@ public class ExtraExerciseStudentsDto extends ExtracurricularExercisesReply {
 
     private String existVipCourseStr;
 
+    public String getHeadUrl() {
+        return headUrl;
+    }
+
+    public void setHeadUrl(String headUrl) {
+        this.headUrl = headUrl;
+    }
+
     public String getIsRepliedTimelyStr() {
         return isRepliedTimelyStr;
     }

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

@@ -20,8 +20,28 @@ public class StudentHomeworkRecordDto {
 
     private String teacherName;
 
+    private String headUrl;
+
     private int status;
 
+    private String expiryDate;
+
+    public String getHeadUrl() {
+        return headUrl;
+    }
+
+    public void setHeadUrl(String headUrl) {
+        this.headUrl = headUrl;
+    }
+
+    public String getExpiryDate() {
+        return expiryDate;
+    }
+
+    public void setExpiryDate(String expiryDate) {
+        this.expiryDate = expiryDate;
+    }
+
     public Integer getStudentCourseHomeworkId() {
         return studentCourseHomeworkId;
     }

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

@@ -29,6 +29,7 @@
 		<result column="student_name_" property="studentName"/>
 		<result column="teacher_id_" property="teacherId"/>
 		<result column="teacher_name_" property="teacherName"/>
+		<result column="avatar_" property="headUrl"/>
 		<result column="title_" property="title"/>
 		<result column="content_" property="content"/>
 		<result column="expire_date_" property="expireDate"/>
@@ -223,12 +224,13 @@
 			ee.expire_date_,
 			ee.teacher_id_,
 			tea.real_name_ teacher_name_,
+			tea.avatar_,
 			su.username_ student_name_
 		FROM
 			extracurricular_exercises_reply eer
 			LEFT JOIN extracurricular_exercises ee ON ee.id_=eer.extracurricular_exercises_id_
 			LEFT JOIN sys_user su ON su.id_ = eer.user_id_
-			LEFT JOIN sys_user tea ON tea.id_=ee.teacher_id_
+			LEFT JOIN sys_user tea ON tea.id_ = ee.teacher_id_
 			<include refid="queryStudentExtraExercisesCondition"/>
 			ORDER BY eer.create_time_ DESC
 		<include refid="global.limit"/>

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

@@ -83,7 +83,7 @@
                 #{cooperationOrganId}, #{enlightenmentCourseTime}, #{parentMeetingTime}, #{img}, #{directorUserId},
                 #{isClassroomLessons}, #{memo}, #{expectStartGroupDate},
                 #{ownershipType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{repairUserId},
-                #{delFlag},#{paymentValidStartDate},#{paymentValidEndDate},#{paymentPattern},#{courseViewType})
+                #{delFlag},#{paymentValidStartDate},#{paymentValidEndDate},#{paymentPattern},#{courseViewType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -174,7 +174,7 @@
                 group_member_num_ = #{groupMemberNum},
             </if>
             <if test="courseViewType != null">
-                course_view_type_ = #{courseViewType},
+                course_view_type_ = #{courseViewType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="memo != null">
                 memo_ = #{memo},

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

@@ -324,6 +324,9 @@
         <result property="startClassTime" column="start_class_time_"/>
         <result property="teacherId" column="actual_teacher_id_"/>
         <result property="status" column="status_"/>
+        <result property="expiryDate" column="expiry_date_"/>
+        <result property="teacherName" column="real_name_"/>
+        <result property="headUrl" column="avatar_"/>
     </resultMap>
     <select id="findStudentHomeworkRecord" resultMap="StudentHomeworkRecordDto">
         SELECT
@@ -332,10 +335,15 @@
         cs.name_ course_name_,
         CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
         cs.actual_teacher_id_,
-        sch.status_
+        sch.status_,
+        ch.expiry_date_,
+        su.real_name_,
+        su.avatar_
         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_
+        LEFT JOIN sys_user su ON su.id_ = cs.actual_teacher_id_
         WHERE sch.user_id_=#{userId}
         AND DATE_FORMAT(class_date_, '%Y-%m')=DATE_FORMAT(#{classDate}, '%Y-%m')
         ORDER BY CONCAT(cs.class_date_,' ',cs.start_class_time_) DESC