Merge remote-tracking branch 'origin/master'

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

@@ -174,20 +174,19 @@
 			cs.id_ course_homework_id_,
 			ch.content_,
 			ch.create_time_,
-			DATE_FORMAT(ch.create_time_,'%Y-%m-%d') 'day_',
+			DATE_FORMAT(cs.class_date_,'%Y-%m-%d') 'day_',
 			ch.expect_num_,
 			ch.completed_num_,
 			cs.name_ course_schedule_name_,
 			cg.total_class_times_,
 			cg.current_class_times_,
 			cg.music_group_id_,
-			mg.name_ music_group_name_
+			cg.name_ music_group_name_
 		FROM
 			course_homework ch
 			LEFT JOIN course_schedule cs ON ch.course_schedule_id_=cs.id_
 			LEFT JOIN course_schedule_teacher_salary csts ON ch.course_schedule_id_=csts.course_schedule_id_
 			LEFT JOIN class_group cg ON ch.class_group_id_=cg.id_
-			LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_ AND cs.group_type_='MUSIC'
 			WHERE
 			(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
 			AND csts.user_id_=#{userId}
@@ -195,7 +194,7 @@
 				AND ch.class_group_id_=#{classGroupId}
 			</if>
 			<if test="createTime!=null">
-				AND DATE_FORMAT(ch.create_time_,'%Y%m')=DATE_FORMAT(#{createTime},'%Y%m')
+				AND DATE_FORMAT(class_date_, '%Y-%m')=DATE_FORMAT(#{createTime}, '%Y-%m')
 			</if>
 		  ORDER BY ch.id_ DESC
 	</select>
@@ -204,11 +203,15 @@
 			COUNT(*)
 		FROM
 			course_homework ch
+			LEFT JOIN course_schedule cs ON ch.course_schedule_id_=cs.id_
 			LEFT JOIN course_schedule_teacher_salary csts ON ch.course_schedule_id_=csts.course_schedule_id_
 			WHERE csts.user_id_=#{userId}
 			<if test="classGroupId!=null">
 				AND ch.class_group_id_=#{classGroupId}
 			</if>
+			<if test="createTime!=null">
+				AND DATE_FORMAT(class_date_, '%Y-%m')=DATE_FORMAT(#{createTime}, '%Y-%m')
+			</if>
 	</select>
 	<select id="findByTeacherAndCourseHomewok" resultMap="CourseHomework">
 		SELECT