Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -136,7 +136,7 @@
         <result column="class_group_name_" property="classGroupName"/>
         <result column="completed_num_" property="completedNum"/>
         <result column="expect_num_" property="expectNum"/>
-        <result column="next_class_date_" property="expiryDate"/>
+        <result column="expiry_date_" property="expiryDate"/>
         <result column="remark_" property="remark"/>
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="is_replied_" property="isReplied" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
@@ -171,7 +171,7 @@
             mg.name_ music_group_name_,
             cg.name_ class_group_name_,
             CONCAT( class_date_, ' ', start_class_time_ ) start_class_time_,
-            temp.next_class_date_,
+            ch.expiry_date_,
             sch.remark_,
             sch.status_,
             sch.is_replied_
@@ -180,13 +180,6 @@
             LEFT JOIN course_schedule cs ON ch.course_schedule_id_=cs.id_
             LEFT JOIN music_group mg ON ch.music_group_id_=mg.id_
             LEFT JOIN class_group cg ON ch.class_group_id_=cg.id_
-            LEFT JOIN (SELECT
-                class_group_id_,
-                MIN(CONCAT( class_date_, ' ', start_class_time_ )) next_class_date_
-                FROM
-                course_schedule
-                WHERE CONCAT( class_date_, ' ', start_class_time_ )>now()
-                GROUP BY class_group_id_) temp ON ch.class_group_id_=temp.class_group_id_
             <include refid="queryCondition"/>
         ORDER BY CONCAT( class_date_, ' ', start_class_time_ ) DESC
         <include refid="global.limit"/>