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

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroupStudentMapper.java

@@ -13,6 +13,10 @@ public class ClassGroupStudentMapper {
 
 	/**  */
 	private Long id;
+
+	/** 乐团id */
+	@ApiModelProperty(value = "班级编号",required = false)
+	private String musicGroupId;
 	
 	/** 班级 */
 	@ApiModelProperty(value = "班级编号",required = false)
@@ -29,6 +33,14 @@ public class ClassGroupStudentMapper {
 	/**  */
 	private java.util.Date createTime;
 
+	public String getMusicGroupId() {
+		return musicGroupId;
+	}
+
+	public void setMusicGroupId(String musicGroupId) {
+		this.musicGroupId = musicGroupId;
+	}
+
 	public ClassGroupStudentMapper() {
 	}
 
@@ -82,5 +94,4 @@ public class ClassGroupStudentMapper {
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}
-
 }

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

@@ -128,6 +128,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         String userIds = classGroup.getUserIds();
         String[] userIdArr = userIds.split(",");
 
+        classGroup.setExpectStudentNum(userIdArr.length);
         classGroup.setStudentNum(userIdArr.length);
         insert(classGroup);
 
@@ -135,6 +136,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<ClassGroupStudentMapper> classGroupStudentList = new ArrayList<>();
         for (String userId : userIdArr) {
             ClassGroupStudentMapper classGroupStudentMapper = new ClassGroupStudentMapper();
+            classGroupStudentMapper.setMusicGroupId(classGroup.getMusicGroupId());
             classGroupStudentMapper.setClassGroupId(classGroup.getId());
             classGroupStudentMapper.setUserId(Integer.parseInt(userId));
             classGroupStudentMapper.setCreateTime(date);
@@ -172,6 +174,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroup.setSubjectIdList(subjectIds);
         classGroup.setName(name);
         classGroup.setType(ClassGroupTypeEnum.MIX);
+        classGroup.setExpectStudentNum(studentNum);
+        classGroup.setStudentNum(studentNum);
         classGroup.setCreateTime(date);
         classGroup.setUpdateTime(date);
         insert(classGroup);
@@ -921,7 +925,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             throw new Exception("乐团不存在");
         }
         ClassGroup classgroup = classGroupDao.get(classGroup4MixDto.getClassGroupId());
-        if(classgroup == null){
+        if (classgroup == null) {
             throw new Exception("班级不存在");
         }