云教练导出优化

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

@@ -1328,7 +1328,7 @@
         LEFT JOIN course_schedule cs on cssp.`course_schedule_id_` = cs.`id_`
         LEFT JOIN `music_group` mg on mg.`id_` = cssp.`music_group_id_`
         WHERE cs.`group_type_` = 'MUSIC' AND cs.`status_` = 'OVER' AND mg.`status_` = 'PROGRESS'
-        GROUP BY cssp.`user_id_` HAVING COUNT(cs.`id_`) <= 4)
+        GROUP BY cssp.`user_id_` HAVING COUNT(cs.`id_`) &lt;= 4)
         -- 			非管乐
         AND su.id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
         -- 			声部排除

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

@@ -3300,12 +3300,12 @@ public class ExportController extends BaseController {
         }
         OutputStream outputStream = response.getOutputStream();
         try {
-            String[] header = {"学员编号", "学员", "手机号", "是否新用户", "是否激活", "训练总时长", "连续训练天数", "乐团", "所属学校", "指导老师", "声部", "是否有小课",
-                    "训练次数", "训练天数", "训练平均时长", "会员有效期", "是否服务", "是否运营", "关心包", "加油包", "未上课数", "vip课剩余课时", "网管课剩余课时"};
-            String[] body = {"studentId", "studentName", "phone", "newUser?\"是\":\"否\"", "enable?\"是\":\"否\"",
-                            "cloudStudyUseTime+\"分钟\"", "cloudStudyRunningDays+\"天\"", "musicGroupNames", "schoolNames",
+            String[] header = {"学员编号", "学员","年级","班级", "手机号", "是否新用户", "是否激活", "训练总时长", "连续训练天数", "乐团", "乐团主管", "所属学校", "指导老师", "声部", "是否有小课",
+                    "训练次数", "训练天数", "训练平均时长", "会员有效期", "是否服务", "是否运营", "是否云教练活动目标学员", "活动消费金额", "关心包", "加油包", "未上课数", "vip课剩余课时", "网管课剩余课时"};
+            String[] body = {"studentId", "studentName","currentGradeNum","currentClass", "phone", "newUser?\"是\":\"否\"", "enable?\"是\":\"否\"",
+                            "cloudStudyUseTime+\"分钟\"", "cloudStudyRunningDays+\"天\"", "musicGroupNames", "educationName", "schoolNames",
                             "teacherName", "subjectName", "hasVipGroup>0?\"是\":\"否\"", "cloudStudyUseNum+\"次\"", "cloudStudyUseDays+\"天\"",
-                            "cloudStudyUseAvgTime+\"分钟\"", "membershipEndTime", "serviceTag>0?\"是\":\"否\"", "operatingTag>0?\"是\":\"否\"",
+                            "cloudStudyUseAvgTime+\"分钟\"", "membershipEndTime", "serviceTag>0?\"是\":\"否\"", "operatingTag>0?\"是\":\"否\"","countFlag == null?'否':countFlag == 1?'是':'否'","activeAmount",
                             "carePackage>0?carePackage>1?\"已使用\":\"可用\":\"不可用\"", "comeOnPackage>0?comeOnPackage>1?\"已使用\":\"可用\":\"不可用\"",
                             "notStartCourseNum", "notStartVipCourseNum", "notStartPracticeCourseNum"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);