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

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

@@ -804,16 +804,8 @@
         FROM ((SELECT sr.user_id_
                FROM student_registration sr
                     LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
-                        LEFT JOIN sys_user su ON sr.user_id_=su.id_
-               WHERE su.del_flag_=0
-                AND mg.status_='PROGRESS'
-                 AND sr.music_group_status_='NORMAL'
-                <if test="organIds!=null and organIds.size()>0">
-                    AND su.organ_id_ IN
-                    <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
-                        #{organId}
-                    </foreach>
-                </if>)
+               WHERE mg.status_='PROGRESS'
+                AND sr.music_group_status_='NORMAL')
               UNION ALL
               (SELECT
                    cssp.user_id_
@@ -823,14 +815,15 @@
                        LEFT JOIN sys_user su ON cssp.user_id_ = su.id_
                WHERE
                    cssp.group_type_ IN ('VIP', 'PRACTICE')
-                 AND cs.status_='NOT_START'
-                 AND su.del_flag_ = 0
-                <if test="organIds!=null and organIds.size()>0">
-                    AND su.organ_id_ IN
-                    <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
-                        #{organId}
-                    </foreach>
-                </if>)) t
+                 AND cs.status_='NOT_START')) t
+        LEFT JOIN sys_user su ON t.user_id_=su.id_
+        WHERE su.del_flag_=0
+        <if test="organIds!=null and organIds.size()>0">
+            AND su.organ_id_ IN
+            <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
+                #{organId}
+            </foreach>
+        </if>
     </select>
 
     <select id="getOrgansStudentNum" resultType="map">

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -3232,7 +3232,7 @@ public class ExportController extends BaseController {
         try {
             String[] header = {"排名", "分部", "学员总数", "活跃人数", "活跃人数比", "当日使用人数", "当日新增使用人数", "使用人数占比", "付费会员数量","付费会员占比", "新增付费会员"};
             String[] body = {"index", "organName", "totalStudentNum", "cloudStudyLivelyStudentNum", "cloudStudyLivelyStudentDuty+\"%\"",
-                    "cloudStudyUseStudentNum", "newCloudStudyStudentNum", "cloudStudyUseStudentDuty+\"%\"", "vipStudentNum", "vipStudentDuty+\"%\"", "newCloudStudyStudentNum"};
+                    "cloudStudyUseStudentNum", "newCloudStudyStudentNum", "cloudStudyUseStudentDuty+\"%\"", "vipStudentNum", "vipStudentDuty+\"%\"", "newMemberStudentNum"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=employeeInfo-" + DateUtil.getDate(new Date()) + ".xls");