导出记录没有合作单位默认取学生的第一个乐团

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupSubjectGoodsAndInfoDto.java

@@ -29,6 +29,9 @@ public class MusicGroupSubjectGoodsAndInfoDto {
     @ApiModelProperty(value = "乐团报名缴费日历",required = false)
     private MusicGroupPaymentCalender musicGroupPaymentCalender;
 
+    @ApiModelProperty(value = "乐团信息",required = false)
+    private MusicGroup musicGroup;
+
 
     public Map getCourseScheduleInfo() {
         return CourseScheduleInfo;
@@ -77,4 +80,12 @@ public class MusicGroupSubjectGoodsAndInfoDto {
     public void setMusicGroupPaymentCalender(MusicGroupPaymentCalender musicGroupPaymentCalender) {
         this.musicGroupPaymentCalender = musicGroupPaymentCalender;
     }
+
+    public MusicGroup getMusicGroup() {
+        return musicGroup;
+    }
+
+    public void setMusicGroup(MusicGroup musicGroup) {
+        this.musicGroup = musicGroup;
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.biz.dal.dao.MusicGroupDao;
+import com.ym.mec.biz.dal.entity.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -23,10 +25,6 @@ import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
 import com.ym.mec.biz.dal.dto.DelRegisterDto;
 import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfoDto;
 import com.ym.mec.biz.dal.dto.StudentAddDto;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
-import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.page.StudentPreRegistrationQueryInfo;
 import com.ym.mec.biz.dal.page.StudentRegistrationQueryInfo;
@@ -51,6 +49,8 @@ public class StudentRegistrationController extends BaseController {
     private MusicGroupPaymentCalenderCourseSettingsDao musicGroupPaymentCalenderCourseSettingsDao;
     @Autowired
     private StudentPreRegistrationService studentPreRegistrationService;
+    @Autowired
+    private MusicGroupDao musicGroupDao;
 
     @ApiOperation(value = "乐团预报名列表分页查询")
     @GetMapping("/queryPreApplyList")
@@ -182,6 +182,7 @@ public class StudentRegistrationController extends BaseController {
         if (subjectId == null || StringUtils.isEmpty(musicGroupId) || calenderId == null) {
             return failed("参数校验异常");
         }
+        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         MusicGroupSubjectGoodsAndInfoDto subjectGoodsAndInfo = musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, subjectId);
 
         MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderDao.get(calenderId);
@@ -190,6 +191,7 @@ public class StudentRegistrationController extends BaseController {
             musicGroupRegCalender.setMusicGroupPaymentCalenderCourseSettingsList(courseSettings);
             subjectGoodsAndInfo.setMusicGroupPaymentCalender(musicGroupRegCalender);
         }
+        subjectGoodsAndInfo.setMusicGroup(musicGroup);
         return succeed(subjectGoodsAndInfo);
     }