Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into dev

mec-application/src/main/java/com/ym/mec/web/controller/TempDirectorTrainingCampDetailController.java

@@ -80,7 +80,7 @@ public class TempDirectorTrainingCampDetailController extends BaseController {
                     , "studyTarget", "suggestion"}, records);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
-                    "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");
+                    "hment;filename=乐队指导训练营-" + DateUtil.getDate(new Date()) + ".xls");
 
             outputStream = response.getOutputStream();
             workbook.write(outputStream);

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

@@ -243,8 +243,11 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         record.setEnableEvaluation(musicSheetApplication.getIsEvaluated());
         record.setIsConvertibleScore(musicSheetApplication.getIsConvertibleScore());
         record.setScoreType(musicSheetApplication.getScoreType().getCode());
-        if(StringUtils.isNotEmpty(musicSheetApplication.getMusicalInstrumentIds())){
-            if(StringUtils.isNotEmpty(record.getSubjectIds())){
+        if(StringUtils.isNotEmpty(record.getSubjectIds())){
+            //获取第一个声部
+            String[] subjectIds = record.getSubjectIds().split(",");
+            record.setSubjectId(Integer.parseInt(subjectIds[0]));
+            if(StringUtils.isNotEmpty(musicSheetApplication.getMusicalInstrumentIds())){
                 Set<String> subjectNames = new HashSet<>();
                 for (String subjectId : record.getSubjectIds().split(",")) {
                     Instrument instrument = instrumentMap.get(Integer.parseInt(subjectId));