Merge remote-tracking branch 'origin/teacher_income' into teacher_income

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

@@ -314,6 +314,13 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
     List<StudentRegisterPerDto> queryStudentPer(@Param("userIds") Set<Integer> userIds);
 
     /**
+     * 获取学员注册比例
+     *
+     * @return
+     */
+    List<StudentRegisterPerDto> queryStudentPer1(String month);
+
+    /**
      * 获取乐团报名信息和学校信息
      *
      * @param musicGroupId

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

@@ -681,10 +681,11 @@ public class StudentManageServiceImpl implements StudentManageService {
 
     @Override
     public List<StudentRegisterPerDto> queryStudentPer() {
-        Set<Integer> musicUserIds = scheduleStudentPaymentDao.queryMusicStudentPer();
-        Set<Integer> vipUserIds = scheduleStudentPaymentDao.queryVipStudentPer();
-        musicUserIds.addAll(vipUserIds);
-        return studentRegistrationDao.queryStudentPer(musicUserIds);
+        String format = DateUtil.format(DateUtil.addDays(new Date(), -1), DateUtil.ISO_EXPANDED_DATE_FORMAT);
+//        Set<Integer> musicUserIds = scheduleStudentPaymentDao.queryMusicStudentPer();
+//        Set<Integer> vipUserIds = scheduleStudentPaymentDao.queryVipStudentPer();
+//        musicUserIds.addAll(vipUserIds);
+        return studentRegistrationDao.queryStudentPer1(format);
     }
 
     @Override

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

@@ -611,6 +611,13 @@
         <result property="per" column="per_"/>
         <result property="perNum" column="per_num_"/>
     </resultMap>
+    <select id="queryStudentPer1" resultMap="StudentRegisterPerDtoMap">
+        SELECT o.name_ organ_name_,md.total_num_ student_num_,md.activate_num_ per_num_,md.percent_ per_
+        FROM index_base_month_data md
+        LEFT JOIN organization o ON o.id_ = md.organ_id_
+        WHERE data_type_ = 'ACTIVATION_RATE' AND month_ = #{month}
+        ORDER BY md.percent_ DESC,o.id_
+    </select>
     <select id="queryStudentPer" resultMap="StudentRegisterPerDtoMap">
         SELECT a.name_ organ_name_,a.num_ student_num_,b.num_ per_num_,ifnull(b.num_,0)*100/a.num_ per_
         FROM (SELECT o.id_,o.name_,COUNT(DISTINCT su.id_) num_ FROM sys_user su