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

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

@@ -48,6 +48,9 @@ public class ClassGroup4MixDto {
     @ApiModelProperty(value = "排课方式(new -新增 renew-重排)", required = true)
     private String courseAddType;
 
+    @ApiModelProperty(value = "预计学生人数", required = true)
+    private Integer expectStudentNum;
+
     public String getMusicGroupId() {
         return musicGroupId;
     }
@@ -151,4 +154,12 @@ public class ClassGroup4MixDto {
     public void setCourseAddType(String courseAddType) {
         this.courseAddType = courseAddType;
     }
+
+    public Integer getExpectStudentNum() {
+        return expectStudentNum;
+    }
+
+    public void setExpectStudentNum(Integer expectStudentNum) {
+        this.expectStudentNum = expectStudentNum;
+    }
 }

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

@@ -1375,6 +1375,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroup.setName(classGroup4MixDto.getClassGroupName());
         classGroup.setExpectStudentNum(studentList.size());
         classGroup.setStudentNum(studentList.size());
+        classGroup.setExpectStudentNum(classGroup4MixDto.getExpectStudentNum());
         classGroup.setType(classGroup4MixDto.getType());
         classGroup.setDelFlag(0);
         classGroup.setGroupType(GroupType.MUSIC);