网管课导出fix

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

@@ -377,6 +377,8 @@
             <![CDATA[AND CONCAT(cs.class_date_, ' ', cs.end_class_time_) < #{endDate}]]>
         </if>
         AND cs.teach_mode_ = 'ONLINE'
+        AND (cs.is_lock_ IS NULL OR cs.is_lock_=0)
+        AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
         GROUP BY su.organ_id_
     </select>
 
@@ -389,6 +391,7 @@
         AND pg.group_status_ IN ('NORMAL', 'FINISH')
         AND cs.id_ >=1
         AND (cs.is_lock_ IS NULL OR cs.is_lock_=0)
+        AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
         AND CONCAT(cs.class_date_, ' ', cs.end_class_time_) >= #{classDate}
         <if test="endDate != null">
             <![CDATA[AND CONCAT(cs.class_date_, ' ', cs.end_class_time_) < #{endDate}]]>
@@ -409,7 +412,9 @@
         AND vcs.id_ >=1
         AND pcs.id_ >= 1
         AND (vcs.is_lock_ IS NULL OR vcs.is_lock_=0)
+        AND (vcs.del_flag_ IS NULL OR vcs.del_flag_=0)
         AND (pcs.is_lock_ IS NULL OR pcs.is_lock_=0)
+        AND (pcs.del_flag_ IS NULL OR pcs.del_flag_=0)
         AND CONCAT(vcs.class_date_, ' ', vcs.end_class_time_) >= #{classDate}
         AND CONCAT(pcs.class_date_, ' ', pcs.end_class_time_) >= #{classDate}
         <if test="endDate != null">

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

@@ -198,13 +198,13 @@
         FROM course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
         LEFT JOIN practice_group pg ON pg.`id_` = cs.`music_group_id_` AND cs.`group_type_` = 'PRACTICE'
-        WHERE cs.status_ IN ('NOT_START','UNDERWAY') AND (cs.is_lock_ IS NULL OR cs.is_lock_=0)
+        WHERE cs.status_ IN ('NOT_START','UNDERWAY') AND (cs.is_lock_ IS NULL OR cs.is_lock_=0) AND (cs.del_flag_ IS NULL OR cs.is_lock_=0)
         GROUP BY cssp.user_id_
         ) a on a.user_id_ = s.user_id_
         LEFT JOIN (
         SELECT student_id_, count(id_) free_practice_times_
         FROM practice_group
-        WHERE type_='FREE'
+        WHERE type_='FREE' AND group_status_ IN ('NORMAL', 'FINISH')
         GROUP BY student_id_
         ) p ON p.student_id_ = s.user_id_
         <include refid="student4OperatingQueryCondition"/>
@@ -223,13 +223,13 @@
         FROM course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
         LEFT JOIN practice_group pg ON pg.`id_` = cs.`music_group_id_` AND cs.`group_type_` = 'PRACTICE'
-        WHERE cs.status_ IN ('NOT_START','UNDERWAY') AND (cs.is_lock_ IS NULL OR cs.is_lock_=0)
+        WHERE cs.status_ IN ('NOT_START','UNDERWAY') AND (cs.is_lock_ IS NULL OR cs.is_lock_=0) AND (cs.del_flag_ IS NULL OR cs.is_lock_=0)
         GROUP BY cssp.user_id_
         ) a on a.user_id_ = s.user_id_
         LEFT JOIN (
         SELECT student_id_, count(id_) free_practice_times_
         FROM practice_group
-        WHERE type_='FREE'
+        WHERE type_='FREE' AND group_status_ IN ('NORMAL', 'FINISH')
         GROUP BY student_id_
         ) p ON p.student_id_ = s.user_id_
         <include refid="student4OperatingQueryCondition"/>