|  | @@ -1,13 +1,5 @@
 | 
	
		
			
				|  |  |  package com.ym.mec.web.service.impl;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -import java.util.ArrayList;
 | 
	
		
			
				|  |  | -import java.util.Date;
 | 
	
		
			
				|  |  | -import java.util.List;
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -import org.springframework.beans.factory.annotation.Autowired;
 | 
	
		
			
				|  |  | -import org.springframework.stereotype.Service;
 | 
	
		
			
				|  |  | -import org.springframework.transaction.annotation.Transactional;
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |  import com.ym.mec.common.dal.BaseDAO;
 | 
	
		
			
				|  |  |  import com.ym.mec.common.page.PageInfo;
 | 
	
		
			
				|  |  |  import com.ym.mec.common.service.impl.BaseServiceImpl;
 | 
	
	
		
			
				|  | @@ -20,6 +12,7 @@ import com.ym.mec.web.dal.dto.TeacherVipClassInfoDto;
 | 
	
		
			
				|  |  |  import com.ym.mec.web.dal.entity.*;
 | 
	
		
			
				|  |  |  import com.ym.mec.web.dal.enums.ClassGroupStudentStatusEnum;
 | 
	
		
			
				|  |  |  import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
 | 
	
		
			
				|  |  | +import com.ym.mec.web.dal.enums.TeachTypeEnum;
 | 
	
		
			
				|  |  |  import com.ym.mec.web.dal.page.VipClassQueryInfo;
 | 
	
		
			
				|  |  |  import com.ym.mec.web.service.*;
 | 
	
		
			
				|  |  |  import org.springframework.beans.factory.annotation.Autowired;
 | 
	
	
		
			
				|  | @@ -169,7 +162,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 | 
	
		
			
				|  |  |              ClassGroupTeacherMapper classGroupTeacherMapper = new ClassGroupTeacherMapper();
 | 
	
		
			
				|  |  |              classGroupTeacherMapper.setMusicGroupId(highClassGroup.getUserId());
 | 
	
		
			
				|  |  |              classGroupTeacherMapper.setClassGroupId(classGroupId.intValue());
 | 
	
		
			
				|  |  | -            classGroupTeacherMapper.setTeacherRole("BISHOP");
 | 
	
		
			
				|  |  | +            classGroupTeacherMapper.setTeacherRole(TeachTypeEnum.BISHOP);
 | 
	
		
			
				|  |  |              classGroupTeacherMapper.setUserId(highClassGroup.getUserId());
 | 
	
		
			
				|  |  |              classGroupTeacherMapper.setSalary(teacherSalary.getMainTeacherSalary());
 | 
	
		
			
				|  |  |              classGroupTeacherMapper.setCreateTime(date);
 |