管乐迷需求迭代

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentStatisticsSumDto.java

@@ -37,6 +37,17 @@ public class StudentStatisticsSumDto {
     @ApiModelProperty(value = "在册：有课程或排课资格的",required = false)
     private Integer registerNum;
 
+    @ApiModelProperty(value = "只在假期上课的学员数量",required = false)
+    private Integer holidayCourseStudentNum;
+
+    public Integer getHolidayCourseStudentNum() {
+        return holidayCourseStudentNum;
+    }
+
+    public void setHolidayCourseStudentNum(Integer holidayCourseStudentNum) {
+        this.holidayCourseStudentNum = holidayCourseStudentNum;
+    }
+
     public Integer getRegisterNum() {
         return registerNum;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentVisit.java

@@ -45,7 +45,7 @@ public class StudentVisit extends BaseEntity {
     public enum FeedbackTypeEnum implements BaseEnum<String,FeedbackTypeEnum> {
         SLEEPY("SLEEPY", "沉睡"),
         LOST("LOST", "流失"), PAUSE("PAUSE", "暂停"),NORMAL("NORMAL", "在读"),
-        OTHER("OTHER", "其他");
+        OTHER("OTHER", "其他"),HOLIDAY_COURSE("HOLIDAY_COURSE", "假期课程");
 
         private String code;
 

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

@@ -333,7 +333,7 @@
 	<select id="queryStatistics" resultMap="StudentStatisticsDto">
 		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_
+			CASE WHEN ss.last_visit_status_ IN ('NORMAL','PAUSE','SLEEPY','LOST','HOLIDAY_COURSE') THEN ss.last_visit_status_
 			WHEN (ss.no_schedule_num_ > 0 OR ss.sub_course_num_ > 0) AND ss.lately_year_course_consumer_ > 0 THEN 'NORMAL'
 			WHEN (ss.no_schedule_num_ > 0 OR suca.course_balance_ > 0) AND (ss.over_course_num_ &lt;= 0 OR 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'
@@ -372,6 +372,7 @@
 	</resultMap>
 	<select id="studentSmallClassStatisticsSum" resultMap="StudentStatisticsSumDto">
 		SELECT
+		COUNT(CASE WHEN ss.last_visit_status_ = 'HOLIDAY_COURSE' THEN 1 ELSE NULL END) 'holidayCourseStudentNum',
 		COUNT(CASE WHEN ss.last_visit_status_ = 'SLEEPY' OR (ss.last_visit_status_ IS NULL AND (ss.no_schedule_num_ > 0 OR suca.course_balance_ > 0) AND (ss.over_course_num_ &lt;= 0 OR ss.lately_year_course_consumer_ &lt;= 0)) THEN 1 ELSE NULL END) 'sleepStudentNum',
 		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_ &lt;= 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_ &lt;= 0 AND ss.no_schedule_num_ &lt;= 0 THEN 1 ELSE NULL END) 'sleepStudentNoNotSchedule',