Merge branch 'zx_2022-11-22' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -249,16 +249,16 @@
 			</if>
 			<if test="studentStatus != null and studentStatus != ''">
 				<if test="studentStatus == 'NORMAL'">
-					AND (ss.last_visit_status_ = #{feedbackType} OR ((ss.no_schedule_num_ > 0 OR ss.sub_course_num_ > 0) AND ss.lately_year_course_consumer_ > 0))
+					AND (ss.last_visit_status_ = #{feedbackType} OR (ss.last_visit_status_ IS NULL AND (ss.no_schedule_num_ > 0 OR ss.sub_course_num_ > 0) AND ss.lately_year_course_consumer_ > 0))
 				</if>
 				<if test="studentStatus == 'SLEEPY'">
-					AND (ss.last_visit_status_ = #{feedbackType} OR (ss.over_course_num_ > 0 AND (ss.sub_course_num_ > 0 OR ss.no_schedule_num_ > 0) AND ss.lately_year_course_consumer_ &lt;= 0))
+					AND (ss.last_visit_status_ = #{feedbackType} OR (ss.last_visit_status_ IS NULL AND ss.over_course_num_ > 0 AND (ss.sub_course_num_ > 0 OR ss.no_schedule_num_ > 0) AND ss.lately_year_course_consumer_ &lt;= 0))
 				</if>
 				<if test="studentStatus == 'LOST'">
-					AND (ss.last_visit_status_ = #{feedbackType} OR (ss.over_course_num_ > 0 AND ss.sub_course_num_ &lt;= 0 AND ss.no_schedule_num_ &lt;= 0 AND suca.course_balance_ &lt;= 0))
+					AND (ss.last_visit_status_ = #{feedbackType} OR (ss.last_visit_status_ IS NULL AND ss.over_course_num_ > 0 AND ss.sub_course_num_ &lt;= 0 AND ss.no_schedule_num_ &lt;= 0 AND suca.course_balance_ &lt;= 0))
 				</if>
 				<if test="studentStatus == 'PAUSE'">
-					AND (ss.last_visit_status_ = #{feedbackType} OR (suca.course_balance_ > 0 AND ss.sub_course_num_ &lt;= 0 AND ss.no_schedule_num_ &lt;= 0))
+					AND (ss.last_visit_status_ = #{feedbackType} OR (ss.last_visit_status_ IS NULL AND suca.course_balance_ > 0 AND ss.sub_course_num_ &lt;= 0 AND ss.no_schedule_num_ &lt;= 0))
 				</if>
 			</if>
 			<if test="studentStatus == null or studentStatus == ''">