新增学员去掉必须课程校验，报名中可以到缴费中

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

@@ -1920,12 +1920,22 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if(sysUser == null){
             throw new BizException("用户信息获取失败");
         }
-        MusicGroup musicGroup = saveLog(musicGroupId,MusicGroupStatusEnum.PAY);
+        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+        if(musicGroup == null){
+            throw new BizException("乐团信息不存在");
+        }
         //记录操作日志
-        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"确认开团(缴费中 -> 筹备中)",sysUser.getId(),""));
+        String event;
+        if(musicGroup.getStatus() == MusicGroupStatusEnum.APPLY){
+            event = "确认开团(报名中 -> 筹备中)";
+        }else if (musicGroup.getStatus() == MusicGroupStatusEnum.PAY){
+            event = "确认开团(缴费中 -> 筹备中)";
+        }else {
+            throw new BizException("当前乐团状态不支持此操作");
+        }
+        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,event,sysUser.getId(),""));
         musicGroup.setStatus(MusicGroupStatusEnum.PREPARE);
         musicGroupDao.update(musicGroup);
-
         //给家长发送乐团基础训练课短信
         //获取所有乐团学员列表
         List<StudentRegistration> students = studentRegistrationDao.queryStudentByMusicGroupId(musicGroupId);

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

@@ -536,9 +536,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         if (studentRegistration == null) {
             throw new BizException("参数校验失败");
         }
-        if(studentAddDto.getSignClassId() == null && studentAddDto.getMixClassId() == null){
+        /*if(studentAddDto.getSignClassId() == null && studentAddDto.getMixClassId() == null){
             throw new BizException("参数校验失败: 单技班或合奏班必填一项");
-        }
+        }*/
         String musicGroupId = studentRegistration.getMusicGroupId();
 
         StudentRegistration phoneAndMusicGroupId = studentRegistrationDao.getByPhoneAndMusicGroupId(musicGroupId, studentRegistration.getParentsPhone());

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

@@ -2,20 +2,19 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
+import com.ym.mec.biz.dal.dao.VipGroupDao;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.GroupType;
-import com.ym.mec.biz.dal.enums.KitPurchaseMethodEnum;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.page.CourseScheduleTeacherSalaryQueryInfo;
 import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo;
 import com.ym.mec.biz.dal.page.StudentRegistrationQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.excel.POIUtil;
@@ -28,11 +27,12 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RequestMapping
 @Api(tags = "数据导出服务")
@@ -54,12 +54,8 @@ public class ExportController extends BaseController {
     @Autowired
     private StudentPaymentOrderService studentPaymentOrderService;
     @Autowired
-    private StudentPaymentOrderDetailDao studentPaymentOrderDetailDao;
-    @Autowired
     private StudentRegistrationDao studentRegistrationDao;
     @Autowired
-    private SporadicChargeInfoDao sporadicChargeInfoDao;
-    @Autowired
     private VipGroupDao vipGroupDao;
 
     @ApiOperation(value = "导出学员是否有课")

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

@@ -161,7 +161,7 @@ public class MusicGroupController extends BaseController {
 		return succeed(musicGroupService.openPay(musicGroupId, expireDate));
 	}
 
-	@ApiOperation(value = "确认开团（缴费中 -->  筹备中）")
+	@ApiOperation(value = "确认开团（缴费中(报名中) -->  筹备中）")
 	@PostMapping("/found")
 	@PreAuthorize("@pcs.hasPermissions('musicGroup/found')")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String") })