Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -376,7 +376,7 @@
 		COUNT(CASE WHEN ss.over_course_num_ > 0 AND (ss.sub_course_num_ > 0 OR ss.no_schedule_num_ > 0) AND ss.lately_year_course_consumer_ <= 0 AND ss.no_schedule_num_ > 0 THEN 1 ELSE NULL END) 'sleepStudentHasNotSchedule',
 		COUNT(CASE WHEN ss.over_course_num_ > 0 AND (ss.sub_course_num_ > 0 OR ss.no_schedule_num_ > 0) AND ss.lately_year_course_consumer_ <= 0 AND ss.no_schedule_num_ <= 0 THEN 1 ELSE NULL END) 'sleepStudentNoNotSchedule',
 		COUNT(CASE WHEN ss.last_visit_status_ = 'NORMAL' 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) THEN 1 ELSE NULL END) 'normalStudentNum',
-		COUNT(CASE WHEN ss.last_visit_status_ = 'PAUSE' OR (ss.last_visit_status_ IS NULL AND suca.course_balance_ > 0 AND ss.sub_course_num_ <= 0 AND ss.no_schedule_num_ <= 0 THEN 1 ELSE NULL END)) 'hasCourseBalanceAndNotSubCourseNum',
+		COUNT(CASE WHEN ss.last_visit_status_ = 'PAUSE' OR (ss.last_visit_status_ IS NULL AND suca.course_balance_ > 0 AND ss.sub_course_num_ <= 0 AND ss.no_schedule_num_ <= 0) THEN 1 ELSE NULL END) 'hasCourseBalanceAndNotSubCourseNum',
 		COUNT(CASE WHEN ((ss.no_schedule_num_ > 0 OR ss.sub_course_num_ > 0) AND (ss.lately_year_course_consumer_ > 0 OR ss.over_course_num_ <= 0)) AND ss.no_schedule_num_ > 0 THEN 1 ELSE NULL END) 'normalStudentHasNoScheduleNum',
 		COUNT(CASE WHEN (ss.no_schedule_num_ + ss.sub_course_num_) < 4 THEN 1 ELSE NULL END) 'waitRenewNum',
 		COUNT(CASE WHEN ss.no_schedule_num_ > 0 OR ss.sub_course_num_ > 0 OR ss.over_course_num_ > 0 THEN 1 ELSE NULL END) 'registerNum',

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

@@ -298,7 +298,7 @@
 		<include refid="queryStudentTrainSql"/>
 		GROUP BY su.id_
 		<if test="having == 1">
-			HAVING mcr.total_play_time_ &lt; ${totalTime} OR mcr.train_num_ &lt; ${trainNum}
+			HAVING total_play_time_ &lt; ${totalTime} OR train_num_ &lt; ${trainNum}
 		</if>
 		ORDER BY
 		<if test="sort != null and sort != ''">