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

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

@@ -2541,7 +2541,7 @@
         <if test="searchType == 'ERR_ATTENDANCE'">
             AND ta.teacher_id_ = cs.actual_teacher_id_
             AND cs.status_ = 'OVER'
-            AND (ta.sign_in_status_ != 1 OR ta.sign_out_status_ != 1 OR sa.status_ != 'NORMAL') AND ta.dispose_content_ IS NULL
+            AND (ta.sign_in_status_ != 1 OR ta.sign_out_status_ != 1 OR (sa.status_ != 'NORMAL' AND sa.visit_flag_ = 0)) AND ta.dispose_content_ IS NULL
             AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
         </if>
         <if test="searchType == 'NO_ATTENDANCE'">

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

@@ -742,8 +742,8 @@
 		LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
 		LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_
 		WHERE ta.teacher_id_ = cs.actual_teacher_id_
-		AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_>='2021-02-01'
-		AND (ta.sign_in_status_ != 1 OR ta.sign_out_status_ != 1 OR sa.status_ != 'NORMAL') AND ta.dispose_content_ IS NULL
+		AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_ >= '2021-02-01'
+		AND (ta.sign_in_status_ != 1 OR ta.sign_out_status_ != 1 OR (sa.status_ != 'NORMAL' AND sa.visit_flag_ = 0)) AND ta.dispose_content_ IS NULL
 		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
 		<if test="organIds!=null and organIds.size() > 0">
 			AND cs.organ_id_ IN