Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -468,7 +468,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 //获取老师的默认课酬
                 String courseType = classGroupAndTeacher.getType().equals(ClassGroupTypeEnum.NORMAL) ? "SINGLE" : classGroupAndTeacher.getType().getCode();
 
-                if (musicGroup.getSettlementType().equals(SalarySettlementTypeEnum.CLASSROOM_SALARY)) {
+                if (musicGroup.isClassroomLessons()) {
                     courseType = "CLASSROOM";
                 }
 

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

@@ -231,8 +231,8 @@ public class ClassGroupController extends BaseController {
             @ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "string"),
             @ApiImplicitParam(name = "type", value = "班级类型", required = true, dataType = "string"),
     })
-    public HttpResponseResult classGroupAndTeacher(String musicGroup, ClassGroupTypeEnum type) throws Exception {
-        return succeed(classGroupService.getClassGroupAndTeacherByType(musicGroup,type));
+    public HttpResponseResult classGroupAndTeacher(String musicGroupId, ClassGroupTypeEnum type) throws Exception {
+        return succeed(classGroupService.getClassGroupAndTeacherByType(musicGroupId,type));
     }
 
 }