管乐迷新需求一大堆

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

@@ -249,7 +249,8 @@
 			</if>
 			<if test="studentStatus != null and studentStatus != ''">
 				<if test="studentStatus == 'NORMAL'">
-					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))
+					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.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))
@@ -333,7 +334,7 @@
 		SELECT *,ss.not_start_course_fee_ + ss.no_course_fee_ preCourseFee,
 		ss.no_schedule_num_ + ss.sub_course_num_ subTotalCourse,
 			CASE WHEN ss.last_visit_status_ IN ('NORMAL','PAUSE','SLEEPY','LOST') THEN ss.last_visit_status_
-			WHEN (ss.no_schedule_num_ > 0 OR ss.sub_course_num_ > 0) AND (ss.lately_year_course_consumer_ > 0 OR ss.over_course_num_ &lt;= 0) THEN 'NORMAL'
+			WHEN (ss.no_schedule_num_ > 0 OR ss.sub_course_num_ > 0) AND ss.lately_year_course_consumer_ > 0 THEN 'NORMAL'
 			WHEN 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 THEN 'SLEEPY'
 			WHEN 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 THEN 'LOST'
 			WHEN suca.course_balance_ > 0 AND ss.sub_course_num_ &lt;= 0 AND ss.no_schedule_num_ &lt;= 0 THEN 'PAUSE' ELSE 'OTHER' END student_status_