教学伴奏导出功能，教材列表统计问题修改

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

@@ -50,6 +50,8 @@ public class SysMusicScore {
 	
 	/** 类型PERSON 个人,COMMON公用 */
 	private ExamSongTypeEnum type;
+
+	private String typeName;
 	
 	/** 声部列表 */
 	private String subjectIds;
@@ -105,9 +107,12 @@ public class SysMusicScore {
 
 	//是否显示
 	private Integer showFlag = 0;
+	private String showName;
 
 	private Boolean isOpenMetronome;
-	
+
+	private String openMetronomeName;
+
 	private String museScoreUrl;
 	
 	private String museScoreMemo;
@@ -124,6 +129,30 @@ public class SysMusicScore {
 		this.extConfigJson = extConfigJson;
 	}
 
+	public String getTypeName() {
+		return typeName;
+	}
+
+	public void setTypeName(String typeName) {
+		this.typeName = typeName;
+	}
+
+	public String getOpenMetronomeName() {
+		return openMetronomeName;
+	}
+
+	public String getShowName() {
+		return showName;
+	}
+
+	public void setShowName(String showName) {
+		this.showName = showName;
+	}
+
+	public void setOpenMetronomeName(String openMetronomeName) {
+		this.openMetronomeName = openMetronomeName;
+	}
+
 	public Integer getSubjectId() {
 		return subjectId;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ExamSongTypeEnum.java

@@ -3,7 +3,7 @@ package com.ym.mec.biz.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum ExamSongTypeEnum implements BaseEnum<String, ExamSongTypeEnum> {
-	PERSON("PERSON", "个人"), COMMON("COMMON", "公共");
+	PERSON("PERSON", "个人"), COMMON("COMMON", "公用");
 
 	private String code;
 

mec-biz/src/main/java/com/ym/mec/biz/service/SysMusicScoreService.java

@@ -8,6 +8,8 @@ import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.List;
+
 public interface SysMusicScoreService extends BaseService<Integer, SysMusicScore> {
 
     void updateMusicScore(MusicScoreDto musicScoreDto);
@@ -16,6 +18,8 @@ public interface SysMusicScoreService extends BaseService<Integer, SysMusicScore
 
     void del(Integer id);
 
+    List<SysMusicScore> queryMusicScoreAll(SysExamSongQueryInfo queryInfo);
+
     PageInfo<SysMusicScore> queryMusicScorePage(SysExamSongQueryInfo queryInfo);
     
     PageInfo<SysMusicScore> queryMusicScorePageInfo(SysExamSongQueryInfo queryInfo);

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

@@ -21,6 +21,7 @@ import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.SysMusicScoreMetronomeTranscod;
 import com.ym.mec.biz.dal.dto.SysMusicScoreTranscod;
 import com.ym.mec.biz.dal.entity.SysMusicScoreChangeLog;
+import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.biz.service.UploadFileService;
 import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.common.service.IdGeneratorService;
@@ -28,7 +29,6 @@ import com.ym.mec.util.file.FileUtil;
 import com.ym.mec.util.shell.ScriptUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.commons.util.IdUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -68,6 +68,8 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
     private IdGeneratorService idGeneratorService;
     @Autowired
     private UploadFileService uploadFileService;
+    @Autowired
+    private OrganizationService organizationService;
 
     @Override
     public BaseDAO<Integer, SysMusicScore> getDAO() {
@@ -185,10 +187,26 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         }
     }
 
-    @Override
-    public PageInfo<SysMusicScore> queryMusicScorePage(SysExamSongQueryInfo queryInfo) {
-        PageInfo<SysMusicScore> sysMusicScorePageInfo = queryPage(queryInfo);
-        List<SysMusicScore> rows = sysMusicScorePageInfo.getRows();
+    private void dealMusicScoreParam(SysExamSongQueryInfo queryInfo){
+        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
+        if(queryInfo.getCategoriesId() != null){
+            List<Integer> categoriesIdList = new ArrayList<>();
+            Integer categoriesId = Integer.parseInt(queryInfo.getCategoriesId());
+
+            SysMusicScoreCategories sysMusicScoreCategories = sysMusicScoreCategoriesService.get(categoriesId);
+
+            if(sysMusicScoreCategories == null){
+                throw new BizException("分类找不到");
+            }
+            categoriesIdList.add(categoriesId);
+            sysMusicScoreCategories = sysMusicScoreCategoriesService.getChildTree(sysMusicScoreCategories);
+            getAllCategoryIdList(categoriesIdList, sysMusicScoreCategories.getSysMusicScoreCategoriesList());
+
+            queryInfo.setCategoriesIdList(categoriesIdList);
+        }
+    }
+
+    private void dealMusicScoreData(List<SysMusicScore> rows){
         if (rows != null && rows.size() > 0) {
             Set<Integer> categoriesIds = rows.stream().map(e -> e.getMusicScoreCategoriesId()).collect(Collectors.toSet());
             //获取分部列表
@@ -198,11 +216,14 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
             subjectIds.removeAll(Collections.singleton(null));
             Map<Long, String> subjectMap = new HashMap();
             if (subjectIds.size() > 0) {
-                subjectMap = MapUtil.convertMybatisMap(subjectDao.findBySubjecIds(StringUtils.join(subjectIds, ",")));
+                String ids = StringUtils.join(subjectIds, ",");
+                subjectMap = MapUtil.convertMybatisMap(subjectDao.findBySubjecIds(ids));
             }
             Map<Integer, String> map = new HashMap<>(categoriesIds.size());
             for (Integer categoriesId : categoriesIds) {
-                map.put(categoriesId, getParentTreeName(categoriesId));
+                if(null != categoriesId){
+                    map.put(categoriesId, getParentTreeName(categoriesId));
+                }
             }
             for (SysMusicScore row : rows) {
                 row.setCategoriesName(map.get(row.getMusicScoreCategoriesId()));
@@ -210,6 +231,30 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
                 row.setSubjectName(subjectMap.get(row.getSubjectId()));
             }
         }
+    }
+
+    @Override
+    public List<SysMusicScore> queryMusicScoreAll(SysExamSongQueryInfo queryInfo) {
+        //封装查询参数
+        dealMusicScoreParam(queryInfo);
+        Map<String, Object> params = new HashMap<String, Object>();
+        MapUtil.populateMap(params, queryInfo);
+
+        List<SysMusicScore> rows = findAll(params);
+        //处理查询结果
+        dealMusicScoreData(rows);
+        return rows;
+    }
+
+    @Override
+    public PageInfo<SysMusicScore> queryMusicScorePage(SysExamSongQueryInfo queryInfo) {
+        //封装查询参数
+        dealMusicScoreParam(queryInfo);
+
+        PageInfo<SysMusicScore> sysMusicScorePageInfo = queryPage(queryInfo);
+        List<SysMusicScore> rows = sysMusicScorePageInfo.getRows();
+        //处理查询结果
+        dealMusicScoreData(rows);
         return sysMusicScorePageInfo;
     }
 
@@ -386,4 +431,5 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         }
 
     }
+
 }

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

@@ -165,7 +165,7 @@
 	</select>
 	<select id="findByParentId" resultMap="SysMusicScoreCategories">
 		SELECT sm.*,
-		(select count(1) from sys_music_score sms where sm.id_ = sms.music_score_categories_id_) as music_score_num_sum_
+		(select count(1) from sys_music_score sms where sms.del_flag_ = 0 and sm.id_ = sms.music_score_categories_id_) as music_score_num_sum_
         FROM sys_music_score_categories sm
 		<include refid="queryTree"/>
  		ORDER BY sm.order_

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

@@ -45,10 +45,7 @@
 		SELECT * FROM sys_music_score WHERE id_ = #{id} 
 	</select>
 	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="SysMusicScore">
-		SELECT * FROM sys_music_score ORDER BY id_
-	</select>
+
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicScore" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
@@ -125,6 +122,19 @@
 		UPDATE sys_music_score SET del_flag_ = 1 WHERE id_ = #{id}
 	</update>
 
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="SysMusicScore">
+		SELECT ses.*,su.real_name_ create_user_name_,smsc.name_ categories_name_,smsc.id_ categories_id_,
+		smsa.mp3_url_ accompaniment_url_,smsa.metronome_mp3_url_ accompaniment_metronome_url_,smsa.is_open_metronome_,smsa.subject_id_,smsa.xml_url_
+		FROM sys_music_score ses
+		LEFT JOIN sys_music_score_accompaniment smsa ON smsa.exam_song_id_ = ses.id_
+		LEFT JOIN sys_user su ON ses.create_user_id_ = su.id_
+		LEFT JOIN sys_music_score_categories smsc ON smsc.id_ = ses.music_score_categories_id_
+		<include refid="queryPageSql"/>
+		GROUP BY ses.id_
+		ORDER BY ses.music_score_categories_id_ DESC,ses.order_ ASC,ses.create_time_ DESC,ses.id_ desc
+	</select>
+
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScore" parameterType="map">
 		SELECT ses.*,su.real_name_ create_user_name_,smsc.name_ categories_name_,smsc.id_ categories_id_,

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

@@ -150,52 +150,52 @@ public class ExportController extends BaseController {
     @RequestMapping("export/now")
     @PreAuthorize("@pcs.hasPermissions('export/now')")
     public void export(HttpServletResponse response, @RequestBody ExportDto exportDto) throws Exception {
-        if(exportDto.getExportEnum() == ExportEnum.MUSIC_GROUP_REGISTER){
-            exportService.musicGroupRegister(response,exportDto);
-        }else if(exportDto.getExportEnum() == ExportEnum.MUSIC_GROUP_NORMAL_STUDENT_NUM){
-            exportService.musicGroupNormalStudentNum(response,exportDto);
-        }else {
+        if (exportDto.getExportEnum() == ExportEnum.MUSIC_GROUP_REGISTER) {
+            exportService.musicGroupRegister(response, exportDto);
+        } else if (exportDto.getExportEnum() == ExportEnum.MUSIC_GROUP_NORMAL_STUDENT_NUM) {
+            exportService.musicGroupNormalStudentNum(response, exportDto);
+        } else {
             Map<String, Object> queryInfo = exportDto.getQueryInfo();
-            if(queryInfo == null){
+            if (queryInfo == null) {
                 queryInfo = new HashMap<>(10);
             }
-            queryInfo.put("page",1);
-            queryInfo.put("rows",49999);
-            queryInfo.put("isExport",true);
-            exportService.export(response,exportService.getExportFuncMap().get(exportDto.getExportEnum()).apply(queryInfo),exportDto);
+            queryInfo.put("page", 1);
+            queryInfo.put("rows", 49999);
+            queryInfo.put("isExport", true);
+            exportService.export(response, exportService.getExportFuncMap().get(exportDto.getExportEnum()).apply(queryInfo), exportDto);
         }
     }
 
     @ApiOperation(value = "导出到报表中心")
     @PostMapping("export/managerDownload")
     @PreAuthorize("@pcs.hasPermissions('export/managerDownload')")
-    public HttpResponseResult managerDownload(@RequestBody ExportDto exportDto){
-        if(exportDto.getHeadColumns() == null || exportDto.getHeadColumns().size() == 0){
+    public HttpResponseResult managerDownload(@RequestBody ExportDto exportDto) {
+        if (exportDto.getHeadColumns() == null || exportDto.getHeadColumns().size() == 0) {
             throw new BizException("请选择导出字段");
         }
         Map<String, Object> queryInfo = exportDto.getQueryInfo();
-        if(queryInfo == null){
+        if (queryInfo == null) {
             queryInfo = new HashMap<>(10);
         }
-        queryInfo.put("page",1);
-        queryInfo.put("rows",49999);
-        queryInfo.put("isExport",true);
-        return exportService.getExportManageFuncMap().get(exportDto.getExportEnum()).apply(queryInfo,exportDto.getHeadColumns());
+        queryInfo.put("page", 1);
+        queryInfo.put("rows", 49999);
+        queryInfo.put("isExport", true);
+        return exportService.getExportManageFuncMap().get(exportDto.getExportEnum()).apply(queryInfo, exportDto.getHeadColumns());
     }
 
 
     @ApiOperation(value = "导出乐团课列表详情")
     @PostMapping("export/exportMusicGroupCourseList")
     @PreAuthorize("@pcs.hasPermissions('export/exportMusicGroupCourseList')")
-    public HttpResponseResult exportMusicGroupCourseList(ExportUserAccountQueryInfo queryInfo){
+    public HttpResponseResult exportMusicGroupCourseList(ExportUserAccountQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        queryInfo.setOrganId(organizationService.getEmployeeOrgan(sysUser.getId(),queryInfo.getOrganId(),sysUser.getIsSuperAdmin()));
+        queryInfo.setOrganId(organizationService.getEmployeeOrgan(sysUser.getId(), queryInfo.getOrganId(), sysUser.getIsSuperAdmin()));
         Integer i = musicGroupDao.countMusicGroupCourseList(queryInfo);
         if (Objects.isNull(i) || i <= 0) {
             throw new BizException("没有可导出的记录");
         }
-        ManagerDownload managerDownload = exportService.saveManagerDownload(ExportTypeEnum.MUSIC_GROUP_DATA_EXPORT,sysUser.getId());
-        return exportService.asyncExport(() -> exportService.exportMusicGroupCourseList(managerDownload,queryInfo),managerDownload.getName());
+        ManagerDownload managerDownload = exportService.saveManagerDownload(ExportTypeEnum.MUSIC_GROUP_DATA_EXPORT, sysUser.getId());
+        return exportService.asyncExport(() -> exportService.exportMusicGroupCourseList(managerDownload, queryInfo), managerDownload.getName());
     }
 
     @ApiOperation(value = "乐团详情--课表详情列表（课表详情）导出")
@@ -209,8 +209,8 @@ public class ExportController extends BaseController {
         queryInfo.setPage(1);
         queryInfo.setRows(65535);
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        ManagerDownload managerDownload = exportService.saveManagerDownload(ExportTypeEnum.MUSIC_GROUP_COURSE_LIST,sysUser.getId());
-        return exportService.asyncExport(() -> exportService.exportMusicGroupCourseScheduleDetail(queryInfo, managerDownload),managerDownload.getName());
+        ManagerDownload managerDownload = exportService.saveManagerDownload(ExportTypeEnum.MUSIC_GROUP_COURSE_LIST, sysUser.getId());
+        return exportService.asyncExport(() -> exportService.exportMusicGroupCourseScheduleDetail(queryInfo, managerDownload), managerDownload.getName());
     }
 
     @ApiOperation(value = "乐团列表导出")
@@ -221,16 +221,16 @@ public class ExportController extends BaseController {
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
         List<MusicGroup> rows = musicGroupService.queryMusicGroupPage(queryInfo).getRows();
-        if(rows.size() < 1){
+        if (rows.size() < 1) {
             throw new BizException("没有可导出数据");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "乐团编号", "乐团名称","合作单位", "乐团状态",
-                    "收费模式","收费类型","乐团主管","成团人数", "在读人数", "申请时间", "成团时间", "清单状态", "收费标准"}, new String[]{
-                    "organName", "id", "name","cooperationOrganName", "status.msg", "courseViewType.msg","chargeTypeName",
-                    "educationalTeacherName", "groupMemberNum","payNum"
-                    ,"createTime","updateTime","hasVerifyMusicalList?'已确认':'未确认'", "chargeStandard"}, rows);
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "乐团编号", "乐团名称", "合作单位", "乐团状态",
+                    "收费模式", "收费类型", "乐团主管", "成团人数", "在读人数", "申请时间", "成团时间", "清单状态", "收费标准"}, new String[]{
+                    "organName", "id", "name", "cooperationOrganName", "status.msg", "courseViewType.msg", "chargeTypeName",
+                    "educationalTeacherName", "groupMemberNum", "payNum"
+                    , "createTime", "updateTime", "hasVerifyMusicalList?'已确认':'未确认'", "chargeStandard"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");
@@ -259,15 +259,15 @@ public class ExportController extends BaseController {
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
         List<ChildrenStatisticsDetailDto> rows = childrenDayReserveService.exportStatisticsDetail(queryInfo);
-        if(rows.size() < 1){
+        if (rows.size() < 1) {
             throw new BizException("没有可导出数据");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "合作单位", "乐团","学员编号", "学员姓名", "手机号","声部","所在班级","指导老师", "是否预约", "器乐等级", "乐理等级", "是否购买VIP","是否购买乐理课"}, new String[]{
-                    "organName", "cooperationOrganName", "musicGroupName","userId", "username", "phone","subjectName",
-                    "currentClass", "realName", "isReserve == true ?'是':'否'","gradeLeave"
-                    ,"theoryLevel","buyVipFlag == true ?'是':'否'","buyTheoryCourseFlag == true ?'是':'否'"}, rows);
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "合作单位", "乐团", "学员编号", "学员姓名", "手机号", "声部", "所在班级", "指导老师", "是否预约", "器乐等级", "乐理等级", "是否购买VIP", "是否购买乐理课"}, new String[]{
+                    "organName", "cooperationOrganName", "musicGroupName", "userId", "username", "phone", "subjectName",
+                    "currentClass", "realName", "isReserve == true ?'是':'否'", "gradeLeave"
+                    , "theoryLevel", "buyVipFlag == true ?'是':'否'", "buyTheoryCourseFlag == true ?'是':'否'"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");
@@ -291,18 +291,18 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "2021双十一学员购买详情")
     @RequestMapping("export/doubleEleven2021OrderDetail")
     @PreAuthorize("@pcs.hasPermissions('export/doubleEleven2021OrderDetail')")
-    public void doubleEleven2021OrderDetail(HttpServletResponse response,DoubleEleven2021QueryInfo queryInfo) throws IOException {
+    public void doubleEleven2021OrderDetail(HttpServletResponse response, DoubleEleven2021QueryInfo queryInfo) throws IOException {
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
         List<DoubleEleven2021OrderDetailDto> rows = vipGroupActivityService.doubleEleven2021OrderDetail(queryInfo).getRows();
-        if(rows.size() < 1){
+        if (rows.size() < 1) {
             throw new BizException("没有可导出数据");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学员编号", "学员姓名","订单号", "交易金额",
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学员编号", "学员姓名", "订单号", "交易金额",
                     "交易时间", "订单创建时间", "购买课程", "赠送会员"}, new String[]{
-                    "userId", "username", "orderNo","amount", "payTime", "createTime","type",
+                    "userId", "username", "orderNo", "amount", "payTime", "createTime", "type",
                     "giveMember==0?'否':'是'"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
@@ -327,19 +327,19 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "分部2021双11活动统计导出")
     @RequestMapping("export/organDoubleEleven2021Statis")
     @PreAuthorize("@pcs.hasPermissions('export/organDoubleEleven2021Statis')")
-    public void organDoubleEleven2021Statis(HttpServletResponse response,OrganDoubleEleven2021StatisDto statisDto) throws IOException {
+    public void organDoubleEleven2021Statis(HttpServletResponse response, OrganDoubleEleven2021StatisDto statisDto) throws IOException {
         List<DoubleEleven2021Dto> rows = vipGroupActivityService.organDoubleEleven2021Statis(statisDto);
-        if(rows.size() < 1){
+        if (rows.size() < 1) {
             throw new BizException("没有可导出数据");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "总成交金额","总购买人数", "人均购买金额",
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "总成交金额", "总购买人数", "人均购买金额",
                     "20节1v1成交金额", "20节1v1成交人数", "40节1v1成交金额", "40节1v1成交人数", "20节1v2成交金额", "20节1v2成交人数",
                     "40节1v2成交金额", "40节1v2成交人数", "乐理课成交金额", "乐理课成交人数", "赠送会员人数"}, new String[]{
-                    "organName", "totalBuyAmount", "totalBuyNum","avgBuyAmount", "vip1V120Amount", "vip1V120Num","vip1V140Amount",
-                    "vip1V140Num", "vip1V220Amount", "vip1V220Num","vip1V240Amount"
-                    ,"vip1V240Num","musicTheoryAmount","musicTheoryNum","giveMemberNum"}, rows);
+                    "organName", "totalBuyAmount", "totalBuyNum", "avgBuyAmount", "vip1V120Amount", "vip1V120Num", "vip1V140Amount",
+                    "vip1V140Num", "vip1V220Amount", "vip1V220Num", "vip1V240Amount"
+                    , "vip1V240Num", "musicTheoryAmount", "musicTheoryNum", "giveMemberNum"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");
@@ -366,18 +366,18 @@ public class ExportController extends BaseController {
     public void userCashAccountDetail(HttpServletResponse response, ExportUserAccountQueryInfo queryInfo) throws IOException {
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         List<SysUserCashAccountDetail> cashAccountDetails = sysUserCashAccountDetailDao.exportDetail(queryInfo);
-        if(cashAccountDetails.size() < 1){
+        if (cashAccountDetails.size() < 1) {
             throw new BizException("没有可导出数据");
         }
-        if(cashAccountDetails.size() > 49999){
+        if (cashAccountDetails.size() > 49999) {
             throw new BizException("数据超长，请联系管理员");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部","学员编号", "姓名", "电话", "声部",
-                    "交易类型", "交易金额", "交易时间", "备注","可用余额"}, new String[]{
-                    "organName","userId", "username", "phone", "subjectName",
-                    "type.msg", "amount", "createTime", "comment","balance"}, cashAccountDetails);
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学员编号", "姓名", "电话", "声部",
+                    "交易类型", "交易金额", "交易时间", "备注", "可用余额"}, new String[]{
+                    "organName", "userId", "username", "phone", "subjectName",
+                    "type.msg", "amount", "createTime", "comment", "balance"}, cashAccountDetails);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");
@@ -401,21 +401,21 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "学生个人课程余额导出")
     @PostMapping("export/userCoursesAccount")
     @PreAuthorize("@pcs.hasPermissions('export/userCoursesAccount')")
-    public void userCoursesAccount(HttpServletResponse response,ExportUserAccountQueryInfo queryInfo) throws IOException {
+    public void userCoursesAccount(HttpServletResponse response, ExportUserAccountQueryInfo queryInfo) throws IOException {
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         List<SysUserCoursesAccountDetail> coursesAccountDetails = sysUserCoursesAccountDetailDao.exportDetail(queryInfo);
-        if(coursesAccountDetails.size() < 1){
+        if (coursesAccountDetails.size() < 1) {
             throw new BizException("没有可导出数据");
         }
-        if(coursesAccountDetails.size() > 49999){
+        if (coursesAccountDetails.size() > 49999) {
             throw new BizException("数据超长，请联系管理员");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学员编号", "姓名", "电话", "声部",
-                    "交易类型", "交易金额", "交易时间", "备注","可用余额"}, new String[]{
+                    "交易类型", "交易金额", "交易时间", "备注", "可用余额"}, new String[]{
                     "organName", "userId", "username", "phone", "subjectName",
-                    "type.msg", "amount", "createTime", "comment","balance"}, coursesAccountDetails);
+                    "type.msg", "amount", "createTime", "comment", "balance"}, coursesAccountDetails);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");
@@ -600,7 +600,7 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学员编号", "学员姓名", "学员声部", "学员状态", "手机号",
-                    "缴费开始日期", "缴费截止日期", "是否开启缴费", "缴费状态", "支付时间","会员金额", "乐器金额", "课程金额", "辅件金额", "乐保金额", "活动金额"}, new String[]{
+                    "缴费开始日期", "缴费截止日期", "是否开启缴费", "缴费状态", "支付时间", "会员金额", "乐器金额", "课程金额", "辅件金额", "乐保金额", "活动金额"}, new String[]{
                     "userId", "sysUser.username", "studentRegistration.subjectName", "studentRegistration.musicGroupStatus.msg", "sysUser.phone",
                     "startPaymentDateMgpc", "deadlinePaymentDateMgpc", "openFlag.msg", "paymentStatus.desc", "payTime",
                     "cloudAmount", "musicalAmount", "courseAmount", "accessoriesAmount", "maintenanceAmount", "activityAmount"}, rows);
@@ -883,13 +883,13 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学员编号", "学员姓名", "性别", "家长姓名",
-                    "家长联系电话", "是否激活", "是否有课", "是否有网管课","网管课剩余课时","VIP课剩余课时", "课程余额(元)", "账户余额(元)",
+                    "家长联系电话", "是否激活", "是否有课", "是否有网管课", "网管课剩余课时", "VIP课剩余课时", "课程余额(元)", "账户余额(元)",
                     "所在乐团", "乐团所属声部", "所在乐团状态", "所在vip课", "所在VIP状态", "服务标签", "运营标签", "指导老师", "是否签订协议", "是否使用云教练", "会员截止日期", "会员剩余天数", "会员试用结束日期", "会员试用剩余天数"}, new String[]{
                     "organName", "userId", "username", "gender.description", "parentsName", "parentsPhone",
-                    "isActive.msg", "hasCourse.msg", "hasPracticeCourse.msg","noStartPracticeCourseNum","noStartVipCourseNum", "courseBalance", "balance", "musicGroupName",
+                    "isActive.msg", "hasCourse.msg", "hasPracticeCourse.msg", "noStartPracticeCourseNum", "noStartVipCourseNum", "courseBalance", "balance", "musicGroupName",
                     "subjectName", "musicGroupStatus", "vipGroupName", "vipGroupStatus", "serviceTag.msg", "operatingTag.msg", "teacherName", "isSignedContract ? '是' : '否'", "recordUserId == null ? '否' : '是'",
-                    "membershipEndTime","membershipEndTime == null ? hasNoStartCloudTeacher ? \"未生效\" : \"未购买\" : membershipDay >= 0 ? membershipDay : hasNoStartCloudTeacher ? \"未生效\" : \"会员已过期\"",
-                    "experienceMembershipEndTime","membershipEndTime == null ? \"未试用\" : membershipDay >= 0 ? membershipDay : \"已失效\""}, rows);
+                    "membershipEndTime", "membershipEndTime == null ? hasNoStartCloudTeacher ? \"未生效\" : \"未购买\" : membershipDay >= 0 ? membershipDay : hasNoStartCloudTeacher ? \"未生效\" : \"会员已过期\"",
+                    "experienceMembershipEndTime", "membershipEndTime == null ? \"未试用\" : membershipDay >= 0 ? membershipDay : \"已失效\""}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
 
@@ -1119,9 +1119,9 @@ public class ExportController extends BaseController {
         MusicGroup musicGroup = musicGroupDao.get(queryInfo.getMusicGroupId());
         Map<Integer, String> gradeList = organizationService.getGradeList(musicGroup.getOrganId());
         for (StudentApplyDetailDto studentApplyDetailDto : studentApplyDetail) {
-            if(StringUtils.isNotEmpty(studentApplyDetailDto.getCurrentGrade())){
+            if (StringUtils.isNotEmpty(studentApplyDetailDto.getCurrentGrade())) {
                 String grade = gradeList.get(Integer.parseInt(studentApplyDetailDto.getCurrentGrade()));
-                if(StringUtils.isNotEmpty(grade)){
+                if (StringUtils.isNotEmpty(grade)) {
                     studentApplyDetailDto.setCurrentGrade(grade);
                 }
             }
@@ -1133,19 +1133,19 @@ public class ExportController extends BaseController {
             if (PaymentStatusEnum.YES.equals(studentApplyDetailDto.getPaymentStatus()) && studentApplyDetailDto.getKitGroupPurchaseTypeEnum() == null) {
                 studentApplyDetailDto.setKitGroupPurchaseTypeEnum(KitGroupPurchaseTypeEnum.OWNED);
             }
-            if(studentApplyDetailDto.getPayingStatus().equals(1)){
+            if (studentApplyDetailDto.getPayingStatus().equals(1)) {
                 studentApplyDetailDto.setPayingStatusStr("缴费中");
-            }else if(studentApplyDetailDto.getPayingStatus().equals(2)){
+            } else if (studentApplyDetailDto.getPayingStatus().equals(2)) {
                 studentApplyDetailDto.setPayingStatusStr("审核中");
             }
         }
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学生姓名", "家长姓名", "年级", "班级", "性别", "服从调剂", "报名专业",
-                    "实际专业", "联系电话", "学员缴费状态", "乐器购买方式","缴费中/审核中","是否购买云教练"}, new String[]{
+                    "实际专业", "联系电话", "学员缴费状态", "乐器购买方式", "缴费中/审核中", "是否购买云教练"}, new String[]{
                     "studentName", "parentsName", "currentGrade", "currentClass", "gender.description",
                     "isAllowAdjust.msg", "subjectName", "actualSubjectName", "parentsPhone", "paymentStatus.desc",
-                    "kitGroupPurchaseTypeEnum.msg","payingStatusStr","hasCloudTeacher==1？'有':'没有'"}, studentApplyDetail);
+                    "kitGroupPurchaseTypeEnum.msg", "payingStatusStr", "hasCloudTeacher==1？'有':'没有'"}, studentApplyDetail);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
 
@@ -1211,9 +1211,9 @@ public class ExportController extends BaseController {
             MusicGroup musicGroup = musicGroupDao.get(queryInfo.getMusicGroupId());
             Map<Integer, String> gradeList = organizationService.getGradeList(musicGroup.getOrganId());
             for (MusicGroupStudentsDto row : musicGroupStudentsDtoPageInfo.getRows()) {
-                if(StringUtils.isNotEmpty(row.getCurrentGrade())){
+                if (StringUtils.isNotEmpty(row.getCurrentGrade())) {
                     String grade = gradeList.get(Integer.parseInt(row.getCurrentGrade()));
-                    if(StringUtils.isNotEmpty(grade)){
+                    if (StringUtils.isNotEmpty(grade)) {
                         row.setCurrentGrade(grade);
                     }
                 }
@@ -1246,14 +1246,14 @@ public class ExportController extends BaseController {
                     row.setNextPaymentDateStr(DateUtil.format(row.getNextPaymentDate(), DateUtil.DEFAULT_PATTERN));
                 }
             }
-            String[] header = {"学员编号", "学员姓名", "性别", "联系电话","入团时间", "年级", "班级", "入团专业", "学员状态", "报名缴费", "缴费金额", "是否激活",
-                    "VIP/网管是否有课","关心包","加油包", "欠费金额（元）", "退团原因", "会员截止时间", "会员剩余天数"};
-            String[] body = {"userId", "realName", "gender", "phone","registerTime", "currentGrade", "currentClass", "subjectName", "studentStatus", "paymentStatus.desc"
-                    ,"courseFee", "activeName", "hasCourse ? '是' : '否'"
-                    ,"carePackage == null || carePackage == 0 ? '不可用' : carePackage == 1 ? '可用' : '已使用'"
-                    ,"comeOnPackage == null || comeOnPackage == 0 ? '不可用'' : comeOnPackage == 1 ? '可用' : '已使用'"
-                    ,"noPaymentAmount == null ? 0 : noPaymentAmount", "quitReason",
-                    "membershipEndTime","membershipEndTime == null ? hasNoStartCloudTeacher ? '未生效' : '未购买' : membershipDay >= 0 ? membershipDay : hasNoStartCloudTeacher ? '未生效' : '会员已过期'"};
+            String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "入团时间", "年级", "班级", "入团专业", "学员状态", "报名缴费", "缴费金额", "是否激活",
+                    "VIP/网管是否有课", "关心包", "加油包", "欠费金额（元）", "退团原因", "会员截止时间", "会员剩余天数"};
+            String[] body = {"userId", "realName", "gender", "phone", "registerTime", "currentGrade", "currentClass", "subjectName", "studentStatus", "paymentStatus.desc"
+                    , "courseFee", "activeName", "hasCourse ? '是' : '否'"
+                    , "carePackage == null || carePackage == 0 ? '不可用' : carePackage == 1 ? '可用' : '已使用'"
+                    , "comeOnPackage == null || comeOnPackage == 0 ? '不可用'' : comeOnPackage == 1 ? '可用' : '已使用'"
+                    , "noPaymentAmount == null ? 0 : noPaymentAmount", "quitReason",
+                    "membershipEndTime", "membershipEndTime == null ? hasNoStartCloudTeacher ? '未生效' : '未购买' : membershipDay >= 0 ? membershipDay : hasNoStartCloudTeacher ? '未生效' : '会员已过期'"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, musicGroupStudentsDtoPageInfo.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
@@ -1798,20 +1798,28 @@ public class ExportController extends BaseController {
         if (pageList.getTotal() <= 0) {
             throw new BizException("没有可导出的记录");
         }
-        Map<String,String> map = new HashMap<>(10);
-        map.put("一级","1");map.put("二级","2");map.put("三级","3");map.put("四级","4");map.put("五级","5");
-        map.put("六级","6");map.put("七级","7");map.put("八级","8");map.put("九级","9");map.put("十级","10");
+        Map<String, String> map = new HashMap<>(10);
+        map.put("一级", "1");
+        map.put("二级", "2");
+        map.put("三级", "3");
+        map.put("四级", "4");
+        map.put("五级", "5");
+        map.put("六级", "6");
+        map.put("七级", "7");
+        map.put("八级", "8");
+        map.put("九级", "9");
+        map.put("十级", "10");
         for (DegreeRegistration row : pageList.getRows()) {
             row.setActivityTag(map.get(row.getLevel()));
-            if(row.getType() == 2){
+            if (row.getType() == 2) {
                 row.setSubject("乐理");
             }
             row.setGender("1".equals(row.getGender()) ? "男" : "女");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
-            String[] header = {"姓名", "性别", "编号", "证件号码", "城市", "学校", "报考乐器", "报考级别", "级别", "乐理级别证书", "家长联系电话", "考级费用","备注", "缴费状态", "订单编号", "商户订单号", "报名时间"};
-            String[] body = {"name", "gender","id", "idcard", "city", "school", "subject", "level","activityTag",
+            String[] header = {"姓名", "性别", "编号", "证件号码", "城市", "学校", "报考乐器", "报考级别", "级别", "乐理级别证书", "家长联系电话", "考级费用", "备注", "缴费状态", "订单编号", "商户订单号", "报名时间"};
+            String[] body = {"name", "gender", "id", "idcard", "city", "school", "subject", "level", "activityTag",
                     "theoryCert", "mobile", "money", "memo", "status == 2?'已缴费':status == 3?'已退费':'未缴费'", "orderNo", "transNo", "createTime"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, pageList.getRows());
             response.setContentType("application/octet-stream");
@@ -1847,7 +1855,7 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
 
-            String[] header = {"分部", "单位编号", "单位名称", "是否启用","乐团主管","状态栏"};
+            String[] header = {"分部", "单位编号", "单位名称", "是否启用", "乐团主管", "状态栏"};
             String[] body = {"organization.name", "id", "name", "isEnable == true ? '是':'否'", "realName", "isEnable == true ? '开启' : '未开启'"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, pageList.getRows());
             response.setContentType("application/octet-stream");
@@ -1877,18 +1885,18 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        queryInfo.setOrganIdList(organizationService.getEmployeeOrgan(sysUser.getId(),queryInfo.getOrganIdList(),sysUser.getIsSuperAdmin()));
+        queryInfo.setOrganIdList(organizationService.getEmployeeOrgan(sysUser.getId(), queryInfo.getOrganIdList(), sysUser.getIsSuperAdmin()));
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
         Integer tenantId = TenantContextHolder.getTenantId();
-        if(Objects.equals("COURSE_TIME_ERROR",queryInfo.getSearchType())){
+        if (Objects.equals("COURSE_TIME_ERROR", queryInfo.getSearchType())) {
             String courseStartTimeError = sysTenantConfigService.getTenantConfigValue(SysConfigService.COURSE_START_TIME_ERROR, tenantId);
             String courseEndTimeError = sysTenantConfigService.getTenantConfigValue(SysConfigService.COURSE_END_TIME_ERROR, tenantId);
-            if(StringUtils.isEmpty(courseStartTimeError) || StringUtils.isEmpty(courseEndTimeError)){
+            if (StringUtils.isEmpty(courseStartTimeError) || StringUtils.isEmpty(courseEndTimeError)) {
                 return failed("没有可导出的数据");
             }
-            params.put("courseStartTimeError",courseStartTimeError);
-            params.put("courseEndTimeError",courseEndTimeError);
+            params.put("courseStartTimeError", courseStartTimeError);
+            params.put("courseEndTimeError", courseEndTimeError);
         }
         int count = scheduleService.endCountCourseSchedules(params);
         if (count <= 0) {
@@ -1900,9 +1908,9 @@ public class ExportController extends BaseController {
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
         queryInfo.setIsExport(true);
-        ManagerDownload managerDownload = exportService.saveManagerDownload(ExportTypeEnum.COURSE_SCHEDULE,sysUser.getId());
+        ManagerDownload managerDownload = exportService.saveManagerDownload(ExportTypeEnum.COURSE_SCHEDULE, sysUser.getId());
         TenantContextHolder.setTenantId(tenantId);
-        HttpResponseResult succeed = exportService.asyncExport(() -> exportService.superFindCourseSchedules(queryInfo, managerDownload),managerDownload.getName());
+        HttpResponseResult succeed = exportService.asyncExport(() -> exportService.superFindCourseSchedules(queryInfo, managerDownload), managerDownload.getName());
         TenantContextHolder.clearTenantId();
         return succeed;
     }
@@ -1956,7 +1964,7 @@ public class ExportController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('export/studentOrder')")
     public void studentOrder(String organIds, Date date, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        organIds = organizationService.getEmployeeOrgan(sysUser.getId(),organIds,sysUser.getIsSuperAdmin());
+        organIds = organizationService.getEmployeeOrgan(sysUser.getId(), organIds, sysUser.getIsSuperAdmin());
         Date startTime = DateUtil.getFirstDayOfMonth(date);
         Date EndTime = DateUtil.getLastSecondWithDay(DateUtil.getLastDayOfMonth(date));
 
@@ -2102,7 +2110,7 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        queryInfo.setOrganId(organizationService.getEmployeeOrgan(sysUser.getId(),queryInfo.getOrganId(),sysUser.getIsSuperAdmin()));
+        queryInfo.setOrganId(organizationService.getEmployeeOrgan(sysUser.getId(), queryInfo.getOrganId(), sysUser.getIsSuperAdmin()));
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
         PageInfo<MusicArrearageStudentDto> result = musicGroupPaymentCalenderDetailService.queryArrearageStudents(queryInfo);
@@ -2191,23 +2199,23 @@ public class ExportController extends BaseController {
 
         for (TeacherServeDto row : result.getRows()) {
             row.setDateRange(com.ym.mec.util.date.DateUtil.dateToString(row.getMonday(), "yyyy-MM-dd") + '~' + com.ym.mec.util.date.DateUtil.dateToString(row.getSunday(), "yyyy-MM-dd"));
-            if(row.getActualExercisesNum()<=0){
-                row.setSubmitRate(zero.toString()+"%");
-            }else{
+            if (row.getActualExercisesNum() <= 0) {
+                row.setSubmitRate(zero.toString() + "%");
+            } else {
                 BigDecimal submitRate = new BigDecimal(row.getExercisesReplyNum()).divide(new BigDecimal(row.getActualExercisesNum()), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(oneHundred);
-                row.setSubmitRate(submitRate+"%");
+                row.setSubmitRate(submitRate + "%");
             }
-            if(row.getExercisesReplyNum() <= 0){
-                row.setExercisesMessageRate(zero.toString()+"%");
-            }else {
+            if (row.getExercisesReplyNum() <= 0) {
+                row.setExercisesMessageRate(zero.toString() + "%");
+            } else {
                 BigDecimal exercisesMessageRate = new BigDecimal(row.getExercisesMessageNum()).divide(new BigDecimal(row.getExercisesReplyNum()), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(oneHundred);
-                row.setExercisesMessageRate(exercisesMessageRate+"%");
+                row.setExercisesMessageRate(exercisesMessageRate + "%");
             }
-            if(row.getExercisesReplyNum() <= 0){
-                row.setExercisesMessageTimelyRate(zero.toString()+"%");
-            }else {
+            if (row.getExercisesReplyNum() <= 0) {
+                row.setExercisesMessageTimelyRate(zero.toString() + "%");
+            } else {
                 BigDecimal exercisesMessageTimelyRate = new BigDecimal(row.getExercisesMessageTimelyNum()).divide(new BigDecimal(row.getExercisesReplyNum()), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(oneHundred);
-                row.setExercisesMessageTimelyRate(exercisesMessageTimelyRate+"%");
+                row.setExercisesMessageTimelyRate(exercisesMessageTimelyRate + "%");
             }
         }
 
@@ -2215,7 +2223,7 @@ public class ExportController extends BaseController {
             String[] header = {"分部", "老师编号", "老师姓名", "服务周期", "课后训练(节)", "课后训练(人)", "课外训练(人)", "预计训练布置(人次)", "实际训练布置(人次)", "提交次数", "评价次数", "及时评价次数", "及时评价率", "作业点评率",
                     "训练布置", "训练点评", "训练提交率",
                     "提醒时间", "操作人"};
-            String[] body = {"organName", "teacherId", "teacherName", "dateRange", "homeworkNum", "homeworkStuNum", "exerciseNum", "expectExercisesNum", "actualExercisesNum", "exercisesReplyNum","exercisesMessageNum","exercisesMessageTimelyNum","exercisesMessageTimelyRate","exercisesMessageRate",
+            String[] body = {"organName", "teacherId", "teacherName", "dateRange", "homeworkNum", "homeworkStuNum", "exerciseNum", "expectExercisesNum", "actualExercisesNum", "exercisesReplyNum", "exercisesMessageNum", "exercisesMessageTimelyNum", "exercisesMessageTimelyRate", "exercisesMessageRate",
                     "expectExercisesNum>actualExercisesNum?'异常':'正常'", "exercisesReplyNum>exercisesMessageNum?'异常':'正常'", "submitRate",
                     "remindDate", "operatorName"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, result.getRows());
@@ -2246,7 +2254,7 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        organId = organizationService.getEmployeeOrgan(sysUser.getId(),organId,sysUser.getIsSuperAdmin());
+        organId = organizationService.getEmployeeOrgan(sysUser.getId(), organId, sysUser.getIsSuperAdmin());
         List<IndexErrorDataExportDto> result = indexService.exportIndexErrData(organId, errorType);
         if (CollectionUtils.isEmpty(result)) {
             throw new BizException("没有可导出的记录");
@@ -2330,7 +2338,7 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        queryInfo.setOrganIds(organizationService.getEmployeeOrgan(sysUser.getId(),queryInfo.getOrganIds(),sysUser.getIsSuperAdmin()));
+        queryInfo.setOrganIds(organizationService.getEmployeeOrgan(sysUser.getId(), queryInfo.getOrganIds(), sysUser.getIsSuperAdmin()));
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
         List<IndexErrorDataExportDto> result = indexErrDataRecordService.queryRecord(queryInfo).getRows();
@@ -2367,7 +2375,7 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "老师列表导出")
     @RequestMapping("export/teacherList")
     @PreAuthorize("@pcs.hasPermissions('export/teacherList')")
-    public void exportTeacherList(TeacherQueryInfo queryInfo,HttpServletResponse response) throws IOException {
+    public void exportTeacherList(TeacherQueryInfo queryInfo, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
@@ -2382,9 +2390,9 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             String[] header = {"老师编号", "老师名称", "所属分部", "老师状态", "专业技能", "联系电话", "工作类型",
-                    "员工状态", "已开小课", "试听课安排", "开放网管课","转正日期","离职日期"};
+                    "员工状态", "已开小课", "试听课安排", "开放网管课", "转正日期", "离职日期"};
             String[] body = {"id", "realName", "organName", "lockFlag == 0?'正常':lockFlag == 1?'冻结':'锁定'", "splitSubjectName", "phone", "jobNature.msg",
-                    "isProbationPeriod.msg", "vipNum", "demoNum", "isSupportExtraPracticeLesson?'是':'否'","formalStaffDate","demissionDate"};
+                    "isProbationPeriod.msg", "vipNum", "demoNum", "isSupportExtraPracticeLesson?'是':'否'", "formalStaffDate", "demissionDate"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=teacherPage-" + DateUtil.getDate(new Date()) + ".xls");
@@ -2408,7 +2416,7 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "人力资源导出")
     @RequestMapping("export/employeeInfo")
     @PreAuthorize("@pcs.hasPermissions('export/employeeInfo')")
-    public void exportEmployeeInfo(EmployeeInfoQueryInfo queryInfo,HttpServletResponse response) throws IOException {
+    public void exportEmployeeInfo(EmployeeInfoQueryInfo queryInfo, HttpServletResponse response) throws IOException {
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
         List<EmployeeInfo> rows = employeeInfoService.queryPage(queryInfo).getRows();
@@ -2418,15 +2426,15 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             String[] header = {"编号", "姓名", "手机号", "微信",
-                    "声部", "所在城市", "工作意向", "信息来源","下次沟通时间","入职时间",
-                    "职位", "分部", "人员状态", "证件号码","年龄","性别",
-                    "银行卡", "开户行", "紧急联系人", "紧急联系人关系","紧急联系人电话","最后一次操作时间",
+                    "声部", "所在城市", "工作意向", "信息来源", "下次沟通时间", "入职时间",
+                    "职位", "分部", "人员状态", "证件号码", "年龄", "性别",
+                    "银行卡", "开户行", "紧急联系人", "紧急联系人关系", "紧急联系人电话", "最后一次操作时间",
                     "HRBP", "离职时间"
             };
             String[] body = {"id", "realName", "mobileNo", "wechatNo", "subjectName", "liveCity", "intentionCity",
-                    "sourceFrom", "nextVisitDateStr", "entryDateStr", "position.msg","organName","status.desc",
-                    "idCard", "age", "gender?'男':'女'", "bankCardNo","bankAddress","emergencyContactName",
-                    "emergencyContactRelation", "emergencyContactPhone", "updateTime", "hrbpName","resignationDateStr"};
+                    "sourceFrom", "nextVisitDateStr", "entryDateStr", "position.msg", "organName", "status.desc",
+                    "idCard", "age", "gender?'男':'女'", "bankCardNo", "bankAddress", "emergencyContactName",
+                    "emergencyContactRelation", "emergencyContactPhone", "updateTime", "hrbpName", "resignationDateStr"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=employeeInfo-" + DateUtil.getDate(new Date()) + ".xls");
@@ -2450,7 +2458,7 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "分部下教师关联的会员数据导出")
     @RequestMapping("export/organTeacherMemberStudentData")
     @PreAuthorize("@pcs.hasPermissions('export/organTeacherMemberStudentData')")
-    public void exportEmployeeInfo(TeacherServeQueryInfo queryInfo,HttpServletResponse response) throws IOException {
+    public void exportEmployeeInfo(TeacherServeQueryInfo queryInfo, HttpServletResponse response) throws IOException {
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
         List<TeacherStudentDataDto> rows = teacherService.queryMemberStudentData(queryInfo).getRows();
@@ -2485,20 +2493,20 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "分部云教练学员数据预览导出")
     @RequestMapping("export/organStudentOverView")
     @PreAuthorize("@pcs.hasPermissions('export/organStudentOverView')")
-    public void organStudentOverView(OrganCloudStudyStudentDataQueryInfo queryInfo,HttpServletResponse response) throws IOException {
+    public void organStudentOverView(OrganCloudStudyStudentDataQueryInfo queryInfo, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(),"",sysUser.getIsSuperAdmin());
+        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), "", sysUser.getIsSuperAdmin());
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
-        if(StringUtils.isEmpty(organIds)){
+        if (StringUtils.isEmpty(organIds)) {
             throw new BizException("没有可导出的记录");
         }
         List<Integer> collect = Arrays.stream(organIds.split(",")).mapToInt(Integer::parseInt).boxed().collect(Collectors.toList());
         List<Integer> ids = collect.stream().filter(id -> !OrganizationService.EXCLUDE_ORGAN_IDS.contains(id)).collect(Collectors.toList());
-        if(ids == null || ids.size() == 0){
+        if (ids == null || ids.size() == 0) {
             throw new BizException("没有可导出的记录");
         }
         List<EduOrganStudentDataDto> rows = studentService.queryOrganStudentOverView(ids, queryInfo).getRows();
@@ -2508,7 +2516,7 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             String[] header = {"排名", "分部", "学员总数", "目标人数", "活跃人数", "使用人数", "新增使用人数", "使用比例", "付费会员数", "付费会员占比"};
-            String[] body = {"index","organName", "totalStudentNum", "targetNum", "cloudStudyLivelyStudentNum", "cloudStudyUseStudentNum", "newCloudStudyStudentNum",
+            String[] body = {"index", "organName", "totalStudentNum", "targetNum", "cloudStudyLivelyStudentNum", "cloudStudyUseStudentNum", "newCloudStudyStudentNum",
                     "cloudStudyUseStudentDuty+\"%\"", "vipStudentNum", "vipStudentDuty+\"%\""};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
             response.setContentType("application/octet-stream");
@@ -2533,20 +2541,20 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "分部云教练学员数据详情导出")
     @RequestMapping("export/cloudStudyStudentOverView")
     @PreAuthorize("@pcs.hasPermissions('export/cloudStudyStudentOverView')")
-    public void cloudStudyStudentOverView(OrganCloudStudyStudentDataQueryInfo queryInfo,HttpServletResponse response) throws IOException {
+    public void cloudStudyStudentOverView(OrganCloudStudyStudentDataQueryInfo queryInfo, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(),"",sysUser.getIsSuperAdmin());
+        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), "", sysUser.getIsSuperAdmin());
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
-        if(StringUtils.isEmpty(organIds)){
+        if (StringUtils.isEmpty(organIds)) {
             throw new BizException("没有可导出的记录");
         }
         List<Integer> collect = Arrays.stream(organIds.split(",")).mapToInt(Integer::parseInt).boxed().collect(Collectors.toList());
         List<Integer> ids = collect.stream().filter(id -> !OrganizationService.EXCLUDE_ORGAN_IDS.contains(id)).collect(Collectors.toList());
-        if(ids == null || ids.size() == 0){
+        if (ids == null || ids.size() == 0) {
             throw new BizException("没有可导出的记录");
         }
         List<EduOrganStudentDataDto> rows = indexService.organStudentOverView(ids, queryInfo).getRows();
@@ -2555,7 +2563,7 @@ public class ExportController extends BaseController {
         }
         OutputStream outputStream = response.getOutputStream();
         try {
-            String[] header = {"排名", "分部", "学员总数", "活跃人数", "活跃人数比", "当日使用人数", "当日新增使用人数", "使用人数占比", "付费会员数量","付费会员占比", "新增付费会员"};
+            String[] header = {"排名", "分部", "学员总数", "活跃人数", "活跃人数比", "当日使用人数", "当日新增使用人数", "使用人数占比", "付费会员数量", "付费会员占比", "新增付费会员"};
             String[] body = {"index", "organName", "totalStudentNum", "cloudStudyLivelyStudentNum", "cloudStudyLivelyStudentDuty+\"%\"",
                     "cloudStudyUseStudentNum", "newCloudStudyStudentNum", "cloudStudyUseStudentDuty+\"%\"", "vipStudentNum", "vipStudentDuty+\"%\"", "newMemberStudentNum"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
@@ -2581,7 +2589,7 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "分部云教练学员训练数据导出")
     @RequestMapping("export/cloudStudyStudentTrainData")
     @PreAuthorize("@pcs.hasPermissions('export/cloudStudyStudentTrainData')")
-    public void cloudStudyStudentTrainData(StudentQueryInfo queryInfo,HttpServletResponse response) throws IOException {
+    public void cloudStudyStudentTrainData(StudentQueryInfo queryInfo, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
@@ -2589,7 +2597,7 @@ public class ExportController extends BaseController {
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
 
-        List<EduOrganStudentListExportDto> rows = ((PageInfo<EduOrganStudentListExportDto>)studentService.exportOrganStudentData(queryInfo).getDetail()).getRows();
+        List<EduOrganStudentListExportDto> rows = ((PageInfo<EduOrganStudentListExportDto>) studentService.exportOrganStudentData(queryInfo).getDetail()).getRows();
         if (CollectionUtils.isEmpty(rows)) {
             throw new BizException("没有可导出的记录");
         }
@@ -2599,12 +2607,12 @@ public class ExportController extends BaseController {
         }
         OutputStream outputStream = response.getOutputStream();
         try {
-            String[] header = {"学员编号", "学员","年级","班级", "手机号", "是否新用户", "是否激活", "训练总时长", "连续训练天数", "乐团", "乐团主管", "所属学校", "指导老师", "声部", "是否有小课",
+            String[] header = {"学员编号", "学员", "年级", "班级", "手机号", "是否新用户", "是否激活", "训练总时长", "连续训练天数", "乐团", "乐团主管", "所属学校", "指导老师", "声部", "是否有小课",
                     "训练次数", "训练天数", "训练平均时长", "会员有效期", "是否服务", "是否运营", "是否云教练活动目标学员", "活动消费金额", "关心包", "加油包", "未上课数", "vip课剩余课时", "网管课剩余课时"};
-            String[] body = {"studentId", "studentName","currentGradeNum","currentClass", "phone", "newUser?\"是\":\"否\"", "enable?\"是\":\"否\"",
+            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?\"是\":\"否\"","countFlag == null?'否':countFlag == 1?'是':'否'","activeAmount",
+                    "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);
@@ -2630,24 +2638,24 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "分部云教练活动统计数据导出")
     @RequestMapping("export/countCloudTeacherActive")
     @PreAuthorize("@pcs.hasPermissions('export/countCloudTeacherActive')")
-    public void countCloudTeacherActive(CloudTeacherActiveQueryInfo queryInfo,HttpServletResponse response) throws IOException {
+    public void countCloudTeacherActive(CloudTeacherActiveQueryInfo queryInfo, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(),"",sysUser.getIsSuperAdmin());
+        String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), "", sysUser.getIsSuperAdmin());
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
-        if(StringUtils.isEmpty(organIds)){
+        if (StringUtils.isEmpty(organIds)) {
             throw new BizException("没有可导出的记录");
         }
         List<Integer> collect = Arrays.stream(organIds.split(",")).mapToInt(Integer::parseInt).boxed().collect(Collectors.toList());
         List<Integer> ids = collect.stream().filter(id -> !OrganizationService.EXCLUDE_ORGAN_IDS.contains(id)).collect(Collectors.toList());
-        if(ids == null || ids.size() == 0){
+        if (ids == null || ids.size() == 0) {
             throw new BizException("没有可导出的记录");
         }
         Object object = studentService.countCloudTeacherActive(ids, queryInfo).get("resultList");
-        if(object == null){
+        if (object == null) {
             throw new BizException("没有可导出的记录");
         }
         List<CloudTeacherActiveTargetDto> rows = (List<CloudTeacherActiveTargetDto>) object;
@@ -2680,7 +2688,7 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "云教练活动统计详情")
     @RequestMapping("export/countCloudTeacherActiveDetail")
     @PreAuthorize("@pcs.hasPermissions('export/countCloudTeacherActiveDetail')")
-    public void countCloudTeacherActiveDetail(CloudTeacherActiveQueryInfo queryInfo,HttpServletResponse response) throws IOException {
+    public void countCloudTeacherActiveDetail(CloudTeacherActiveQueryInfo queryInfo, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
@@ -2694,9 +2702,9 @@ public class ExportController extends BaseController {
         //获取分部年级列表
         Map<Integer, String> gradeList = organizationService.getGradeList(Integer.parseInt(queryInfo.getOrganIds()));
         for (CloudTeacherActiveTargetDetailDto row : rows) {
-            if(StringUtils.isNotEmpty(row.getCurrentGradeNum())){
+            if (StringUtils.isNotEmpty(row.getCurrentGradeNum())) {
                 String grade = gradeList.get(Integer.parseInt(row.getCurrentGradeNum()));
-                if(StringUtils.isNotEmpty(grade)){
+                if (StringUtils.isNotEmpty(grade)) {
                     row.setCurrentGradeNum(grade);
                 }
             }
@@ -2743,9 +2751,9 @@ public class ExportController extends BaseController {
 //                    row.setSubjectName("无");
 //                }
 //            }
-            String[] header = {"学员姓名","联系电话","年级","班级","老师推荐专业","是否在学习某件乐器","目前所学乐器","报名参加管乐团家长会了解相关情况","备注"};
-            String[] body = {"userName","phone","currentGrade","currentClass","subjectName == null?'无':subjectName","musicalInstrumentsLearning?'是':'否'",
-                    "musicalInstrumentsName","joinParentMeeting?'是':'否'","remark"};
+            String[] header = {"学员姓名", "联系电话", "年级", "班级", "老师推荐专业", "是否在学习某件乐器", "目前所学乐器", "报名参加管乐团家长会了解相关情况", "备注"};
+            String[] body = {"userName", "phone", "currentGrade", "currentClass", "subjectName == null?'无':subjectName", "musicalInstrumentsLearning?'是':'否'",
+                    "musicalInstrumentsName", "joinParentMeeting?'是':'否'", "remark"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, practiceGroupReviews.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
@@ -2778,10 +2786,10 @@ public class ExportController extends BaseController {
         }
         OutputStream outputStream = response.getOutputStream();
         try {
-            String[] header = {"分部","老师编号","老师姓名","预计安排(人次)","实际安排(人次)","布置率(%)","提交人数","点评次数","点评率(%)","及时点评次数","及时点评率(%)"};
-            String[] body = {"organName","teacherId","teacherName","expectExercisesNum","actualExercisesNum",
-                    "100 * actualExercisesNum / expectExercisesNum","exercisesReplyNum","exercisesMessageNum",
-                    "100 * exercisesMessageNum / exercisesReplyNum", "exercisesMessageTimelyNum","100 * exercisesMessageTimelyNum / exercisesReplyNum"};
+            String[] header = {"分部", "老师编号", "老师姓名", "预计安排(人次)", "实际安排(人次)", "布置率(%)", "提交人数", "点评次数", "点评率(%)", "及时点评次数", "及时点评率(%)"};
+            String[] body = {"organName", "teacherId", "teacherName", "expectExercisesNum", "actualExercisesNum",
+                    "100 * actualExercisesNum / expectExercisesNum", "exercisesReplyNum", "exercisesMessageNum",
+                    "100 * exercisesMessageNum / exercisesReplyNum", "exercisesMessageTimelyNum", "100 * exercisesMessageTimelyNum / exercisesReplyNum"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, list);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=teacherPerformanceIndicator-" + DateUtil.getDate(new Date()) + ".xls");
@@ -2801,6 +2809,7 @@ public class ExportController extends BaseController {
             }
         }
     }
+
     @Resource
     private TempBuyFreeLiveTheoryCourseDao tempBuyFreeLiveTheoryCourseDao;
 
@@ -2819,19 +2828,19 @@ public class ExportController extends BaseController {
     })
     @GetMapping("export/exportBuyFreeLiveTheoryCourseList")
     @PreAuthorize("@pcs.hasPermissions('export/exportBuyFreeLiveTheoryCourseList')")
-    public void exportBuyFreeLiveTheoryCourseList(TempBuyFreeLiveTheoryCourse tempBuyFreeLiveTheoryCourse, HttpServletResponse response) throws IOException{
+    public void exportBuyFreeLiveTheoryCourseList(TempBuyFreeLiveTheoryCourse tempBuyFreeLiveTheoryCourse, HttpServletResponse response) throws IOException {
         List<TempBuyFreeLiveTheoryCourse> list = tempBuyFreeLiveTheoryCourseDao.list(tempBuyFreeLiveTheoryCourse);
         if (list.size() <= 0) {
             return;
         }
 
-        list.stream().forEach(o->{
+        list.stream().forEach(o -> {
             String recommendLevel = o.getRecommendLevel();
-            if(StringUtils.isEmpty(recommendLevel)){
+            if (StringUtils.isEmpty(recommendLevel)) {
                 return;
             }
             LevelEnum levelEnum = LevelEnum.valueOf(recommendLevel);
-            if(null!= levelEnum){
+            if (null != levelEnum) {
                 o.setRecommendLevel(levelEnum.getMsg());
             }
         });
@@ -2839,8 +2848,67 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             String[] header = {
-                    "ID","用户ID","购买学生姓名","老师推荐级别（一级/二级/三级）"};
-            String[] body = {"id","userId","studentName","recommendLevel"};
+                    "ID", "用户ID", "购买学生姓名", "老师推荐级别（一级/二级/三级）"};
+            String[] body = {"id", "userId", "studentName", "recommendLevel"};
+            HSSFWorkbook workbook = POIUtil.exportExcel(header, body, list);
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=BuyFreeLiveTheoryCourse-" + DateUtil.getDate(new Date()) + ".xls");
+
+            outputStream = response.getOutputStream();
+            workbook.write(outputStream);
+            outputStream.flush();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    @Autowired
+    private SysMusicScoreService sysMusicScoreService;
+
+    @ApiOperation(value = "教学伴奏--列表导出")
+    @GetMapping("export/exportMusicScoreList")
+    @PreAuthorize("@pcs.hasPermissions('export/exportMusicScoreList')")
+    public void exportMusicScoreList(SysExamSongQueryInfo queryInfo, HttpServletResponse response) throws IOException {
+        List<SysMusicScore> list = sysMusicScoreService.queryMusicScoreAll(queryInfo);
+        if (list.size() <= 0) {
+            return;
+        }
+
+        list.stream().forEach(o -> {
+            ExamSongTypeEnum type = o.getType();
+            if (null != type) {
+                o.setTypeName(type.getMsg());
+            }
+            String rankIds = o.getRankIds();
+            if (StringUtils.isNotEmpty(rankIds) && rankIds.trim().equals("1")) {
+                o.setRankIds("收费");
+            } else {
+                o.setRankIds("免费");
+            }
+            if (null != o.getIsOpenMetronome() && o.getIsOpenMetronome()) {
+                o.setOpenMetronomeName("播放");
+            } else {
+                o.setOpenMetronomeName("不播放");
+            }
+            String accompaniment = "含节拍器:" + (StringUtils.isEmpty(o.getAccompanimentMetronomeUrl()) ? "否" : "是") + " 不含节拍器:" +
+                    (StringUtils.isEmpty(o.getAccompanimentUrl()) ? "否" : "是");
+            o.setMuseScoreMemo(accompaniment);
+            o.setShowName(o.getShowFlag() == 1 ? "启用" : "停用");
+        });
+
+        OutputStream outputStream = response.getOutputStream();
+        try {
+            String[] header = {
+                    "编号", "名称", "所属声部", "类型", "分类", "是否收费", "节拍器", "是否上传伴奏", "伴奏状态", "上传人", "上传时间"};
+            String[] body = {"id", "name", "subjectName", "typeName", "categoriesName", "rankIds", "openMetronomeName", "museScoreMemo","showName","createUserName","createTime"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, list);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=BuyFreeLiveTheoryCourse-" + DateUtil.getDate(new Date()) + ".xls");

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

@@ -26,10 +26,6 @@ public class SysMusicScoreController extends BaseController {
 
     @Autowired
     private SysMusicScoreService sysMusicScoreService;
-    @Autowired
-    private OrganizationService organizationService;
-    @Autowired
-    private SysMusicScoreCategoriesService sysMusicScoreCategoriesService;
 
     @ApiOperation(value = "修改")
     @PostMapping("/update")
@@ -72,23 +68,6 @@ public class SysMusicScoreController extends BaseController {
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScore/queryPage')")
     public Object queryPage(SysExamSongQueryInfo queryInfo) {
-        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
-        if(queryInfo.getCategoriesId() != null){
-        	
-        	List<Integer> categoriesIdList = new ArrayList<>();
-			Integer categoriesId = Integer.parseInt(queryInfo.getCategoriesId());
-			
-			SysMusicScoreCategories sysMusicScoreCategories = sysMusicScoreCategoriesService.get(categoriesId);
-			
-			if(sysMusicScoreCategories == null){
-				throw new BizException("分类找不到");
-			}
-			categoriesIdList.add(categoriesId);
-			sysMusicScoreCategories = sysMusicScoreCategoriesService.getChildTree(sysMusicScoreCategories);
-			getAllCategoryIdList(categoriesIdList, sysMusicScoreCategories.getSysMusicScoreCategoriesList());
-			
-			queryInfo.setCategoriesIdList(categoriesIdList);
-        }
         return succeed(sysMusicScoreService.queryMusicScorePage(queryInfo));
     }