教师端改版

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

@@ -70,6 +70,16 @@ public class TeacherClassCourseSchudeleDto {
     @ApiModelProperty(value = "助教名称")
     private String teachingNames;
 
+    private Date expiryDate;
+
+    public Date getExpiryDate() {
+        return expiryDate;
+    }
+
+    public void setExpiryDate(Date expiryDate) {
+        this.expiryDate = expiryDate;
+    }
+
     public String getTeachingNames() {
         return teachingNames;
     }

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

@@ -54,6 +54,15 @@ public class TeacherClassHeadInfo {
     @ApiModelProperty(value = "课程类型",required = false)
     private CourseScheduleType CourseScheduleType;
 
+    private String teachMode;
+
+    public String getTeachMode() {
+        return teachMode;
+    }
+
+    public void setTeachMode(String teachMode) {
+        this.teachMode = teachMode;
+    }
 
     public Integer getTotalClassTimes() {
         return totalClassTimes;

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

@@ -46,12 +46,32 @@ public class TeacherHomeworkListDto {
 
     private Date startClassTime;
 
+    private Date endClassTime;
+
+    private Date expiryDate;
+
     private int isReplied;
 
     private int isSubmit;
 
     private int status;
 
+    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;
     }

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

@@ -168,6 +168,8 @@
 		<result property="createTime" column="create_time_"/>
 		<result property="day" column="day_"/>
 		<result property="startClassTime" column="start_class_time_"/>
+		<result property="endClassTime" column="end_class_time_"/>
+		<result property="expiryDate" column="expiry_date_"/>
 	</resultMap>
 
 	<select id="findByClassGroupAndTeacher" resultMap="teacherHomeworkListDto">
@@ -177,6 +179,8 @@
 			ch.create_time_,
 			DATE_FORMAT(cs.class_date_,'%Y-%m-%d') 'day_',
 			CONCAT( class_date_, ' ', start_class_time_ ) start_class_time_,
+			CONCAT( class_date_, ' ', end_class_time_ ) end_class_time_,
+			ch.expiry_date_,
 			ch.expect_num_,
 			ch.completed_num_,
 			cs.name_ course_schedule_name_,

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

@@ -1391,6 +1391,7 @@
         <result column="teach_mode_" property="teachMode" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="school_id_" property="schoolId"/>
         <result column="school_name_" property="schoolName"/>
+        <result column="expiry_date_" property="expiryDate"/>
     </resultMap>
 
     <sql id="teacherClassCourseScheduleQueryCondition">
@@ -1433,10 +1434,12 @@
         su.real_name_ username_,
         cg.total_class_times_,
         cs.schoole_id_ school_id_,
-        s.name_ school_name_
+        s.name_ school_name_,
+        ch.expiry_date_
         FROM
         course_schedule_teacher_salary csts
         LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
+        LEFT JOIN course_homework ch ON ch.course_schedule_id_ = cs.id_
         LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
         LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_
         LEFT JOIN school s ON cs.schoole_id_=s.id_
@@ -1499,10 +1502,12 @@
         GROUP_CONCAT(IF(sa.status_='NORMAL',ssu.username_,NULL)) student_names_,
         MAX(sa.current_class_times_) current_class_times_,
         cs.schoole_id_ school_id_,
+        ch.expiry_date_,
         s.name_ school_name_
         FROM
         student_attendance sa
         LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
+        LEFT JOIN course_homework ch ON ch.course_schedule_id_ = cs.id_
         LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
         LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_
         LEFT JOIN sys_user ssu ON sa.user_id_=ssu.id_