Merge remote-tracking branch 'origin/master'

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

@@ -524,7 +524,7 @@
     <select id="countStudyNum" resultType="java.util.Map">
         SELECT cgsm.class_group_id_ 'key',COUNT(cgsm.user_id_) 'value' FROM class_group_student_mapper cgsm
         LEFT JOIN student_registration sr ON (sr.user_id_ = cgsm.user_id_ AND sr.music_group_id_ = cgsm.music_group_id_)
-        WHERE FIND_IN_SET(cgsm.class_group_id_,#{classGroupIds}) AND cgsm.status_='NORMAL' AND
+        WHERE FIND_IN_SET(cgsm.class_group_id_,#{classGroupIds}) AND cgsm.status_ != 'QUIT' AND
         FIND_IN_SET(sr.music_group_status_,'NORMAL,LEAVE') GROUP BY cgsm.class_group_id_
     </select>
 
@@ -589,6 +589,8 @@
         SELECT COUNT(cs.id_)
         FROM course_schedule cs
         LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_
+        LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
+        LEFT JOIN class_group_teacher_mapper cgtm ON cgtm.class_group_id_ = cs.class_group_id_ AND ta.teacher_id_ = cgtm.user_id_
         <include refid="queryMusicGroupCourseScheduleSql"/>
     </select>
 

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

@@ -113,7 +113,7 @@
 	                current_class_times_ = #{item.currentClassTimes},
 	            </if>
         	</set>
-	        where id = ${item.id}
+	        where id_ = ${item.id}
 	    </foreach>      
 	</update>