Merge branch 'exits_music_group_5_6'

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

@@ -254,6 +254,10 @@ public class ExportServiceImpl implements ExportService {
             if (row.getType().equals(OrderTypeEnum.OUTORDER) && row.getMusicGroupId() != null) {
                 if (cooperationOrganMap.containsKey(Integer.valueOf(row.getMusicGroupId()))) {
                     row.setCooperationOrganName(cooperationOrganMap.get(Integer.valueOf(row.getMusicGroupId())));
+                    CooperationOrgan cooperationOrganEduTeacher = musicGroupDao.findCooperationOrganEduTeacher(Integer.valueOf(row.getMusicGroupId()));
+                    if (cooperationOrganEduTeacher != null) {
+                        row.setEduTeacher(cooperationOrganEduTeacher.getLinkman());
+                    }
                 }
             }
             if (row.getMusicGroupId() != null && row.getMusicGroupId().equals("null")) {
@@ -502,6 +506,10 @@ public class ExportServiceImpl implements ExportService {
             if (row.getType().equals(OrderTypeEnum.OUTORDER) && row.getMusicGroupId() != null) {
                 if (cooperationOrganMap.containsKey(Integer.valueOf(row.getMusicGroupId()))) {
                     row.setCooperationOrganName(cooperationOrganMap.get(Integer.valueOf(row.getMusicGroupId())));
+                    CooperationOrgan cooperationOrganEduTeacher = musicGroupDao.findCooperationOrganEduTeacher(Integer.valueOf(row.getMusicGroupId()));
+                    if (cooperationOrganEduTeacher != null) {
+                        row.setEduTeacher(cooperationOrganEduTeacher.getLinkman());
+                    }
                 }
             }
             if (row.getMusicGroupId() != null && row.getMusicGroupId().equals("null")) {

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

@@ -1147,7 +1147,7 @@ public class ExportController extends BaseController {
         managerDownload.setUpdateTime(nowDate);
         managerDownloadDao.insert(managerDownload);
         exportService.orderList(params, managerDownload);
-        return succeed(fileName+"导出申请已提交,请到【报名中心-下载列表查看】");
+        return succeed(fileName+"导出申请已提交,请到【报表中心-下载列表查看】");
     }