feat:激活率统计优化

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/IndexBaseMonthDataDao.java

@@ -74,7 +74,8 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
      * @date 2021/1/7 0007
      * @return java.util.List<com.ym.mec.biz.dal.dto.IndexBaseMonthDto>
      */
-    List<IndexBaseMonthData> getStudentSignUpData(@Param("dayStr") String dayStr);
+    List<IndexBaseMonthData> getStudentSignUpData(@Param("dayStr") String dayStr,
+                                                  @Param("courseStartDay") String courseStartDay);
 
     /**
      * @describe 统计作业布置数据

mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -234,7 +234,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		//学员数据
 		saveData(indexBaseMonthDataDao.getStudentRegistrationData(dayStr), dayStr, IndexDataType.STUDENT_REGISTRATION_NUM);
 		saveData(indexBaseMonthDataDao.getChargeStudentChangeData(dayStr), dayStr, IndexDataType.CHARGE_STUDENT_CHANGE_RATE);
-		saveData(indexBaseMonthDataDao.getStudentSignUpData(dayStr), dayStr, IndexDataType.ACTIVATION_RATE);
+		saveData(indexBaseMonthDataDao.getStudentSignUpData(dayStr, nowDate.plusMonths(-6).toString()), dayStr, IndexDataType.ACTIVATION_RATE);
 
 		//运营数据
 		saveData(indexBaseMonthDataDao.getSchoolData(dayStr), dayStr, IndexDataType.SCHOOL);

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

@@ -171,7 +171,7 @@
 					 mg.status_ IN ( 'PREPARE', 'PROGRESS' )
 				   AND sr.music_group_status_ = 'NORMAL'
 				   AND DATE_FORMAT(sr.create_time_, '%Y-%m-%d')<=#{dayStr}
-			 ) UNION
+			 ) UNION ALL
 			(
 			 SELECT DISTINCT
 				 cssp.user_id_
@@ -185,6 +185,7 @@
 			   AND cssp.group_type_ IN ('VIP', 'PRACTICE')
 			   AND cs.organ_id_ IS NOT NULL
 			   AND DATE_FORMAT(cssp.create_time_, '%Y-%m-%d')<=#{dayStr}
+				AND cs.class_date_ >= #{courseStartDay}
 			)) u
 			LEFT JOIN sys_user su ON u.user_id_ = su.id_
 		WHERE