涉及乐团id类型修改

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

@@ -123,7 +123,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param musicGroupId
      * @return
      */
-    List<ClassGroupTeachersDto> getClassGroupAndTeacherSalary(String musicGroupId, SalarySettlementTypeEnum type);
+    List<ClassGroupTeachersDto> getClassGroupAndTeacherSalary(String musicGroupId, SalarySettlementTypeEnum type) throws Exception;
 
 
     /**

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

@@ -280,7 +280,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
-    public List<ClassGroupTeachersDto> getClassGroupAndTeacherSalary(String musicGroupId, SalarySettlementTypeEnum type) {
+    public List<ClassGroupTeachersDto> getClassGroupAndTeacherSalary(String musicGroupId, SalarySettlementTypeEnum type) throws Exception {
         //乐团班级及班级老师
         List<ClassGroupTeachersDto> classGroupAndTeachers = getClassGroupAndTeachers(musicGroupId);
 
@@ -291,6 +291,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 //获取老师的默认课酬
                 String courseType = classGroupAndTeacher.getType().equals(ClassGroupTypeEnum.NORMAL) ? "SINGLE" : classGroupAndTeacher.getType().getCode();
                 List<TeacherDefaultMusicGroupSalary> teacherSalaryByUserIdAndType = teacherDefaultMusicGroupSalaryService.getTeacherSalaryByUserIdAndType(classGroupTeacherMapper.getUserId(), courseType, type);
+                if (teacherSalaryByUserIdAndType == null) {
+                    throw new Exception("userId："+classGroupTeacherMapper.getUserId()+"名字："+classGroupTeacherMapper.getUserName()+" 老师没有设置课酬");
+                }
                 classGroupTeacherMapper.setTeacherDefaultMusicGroupSalaryList(teacherSalaryByUserIdAndType);
             }
 

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

@@ -35,6 +35,8 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
     public boolean classGroupTeacherMapperUpdate(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) throws Exception {
         for (ClassGroupTeacherMapper classGroupTeacherMapper : classGroupTeacherMapperList) {
+            classGroupTeacherMapper.getTeacherDefaultMusicGroupSalaryList();
+
             classGroupTeacherMapperDao.update(classGroupTeacherMapper);
         }
         return true;

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

@@ -102,7 +102,7 @@ public class ClassGroupController extends BaseController {
     }
 
     @ApiOperation(value = "乐团班级老师设置")
-    @GetMapping("/addClassGroupTeacher")
+    @PostMapping("/addClassGroupTeacher")
     public Object addClassGroupTeacher(@ApiParam(value = "乐团班级老师json", required = true) @RequestParam List<ClassGroupTeacherMapper> classGroupTeacherMapperList) {
         if (classGroupTeacherMapperList.size() <= 0) {
             return failed("参数不合法");
@@ -121,12 +121,17 @@ public class ClassGroupController extends BaseController {
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
             @ApiImplicitParam(name = "type", value = "结算类型（1-基准课酬，4-梯度课酬）", required = true, dataType = "Integer")})
     public Object findMusicGroupClassTeacherSalary(String musicGroupId, SalarySettlementTypeEnum type) {
-        return succeed(classGroupService.getClassGroupAndTeacherSalary(musicGroupId,type));
+        try {
+            return succeed(classGroupService.getClassGroupAndTeacherSalary(musicGroupId, type));
+        } catch (Exception e) {
+            return failed(e.getMessage());
+        }
     }
 
     @ApiOperation(value = "乐团班级老师课酬确认")
-    @GetMapping("/setClassGroupTeacherSalary")
-    public Object setClassGroupTeacherSalary(@ApiParam(value = "乐团班级老师json", required = true) @RequestParam List<ClassGroupTeacherMapper> classGroupTeacherMapperList) throws Exception {
+    @PostMapping("/setClassGroupTeacherSalary")
+    @ApiImplicitParams({@ApiImplicitParam(name = "classGroupTeacherMapperList", value = "乐团班级老师json", required = true, dataType = "String")})
+    public Object setClassGroupTeacherSalary(@RequestParam List<ClassGroupTeacherMapper> classGroupTeacherMapperList) throws Exception {
         if (classGroupTeacherMapperList.size() <= 0) {
             return failed("参数不合法");
         }
@@ -135,8 +140,8 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "根据群编号，获取群组所有成员基本信息")
     @GetMapping("/findGroupUsers")
-    public Object findGroupUsers(String groupId){
-        if(StringUtils.isEmpty(groupId)){
+    public Object findGroupUsers(String groupId) {
+        if (StringUtils.isEmpty(groupId)) {
             return failed("参数校验错误");
         }
         return succeed(classGroupService.findGroupUsers(groupId));