| 
														
															@@ -27,7 +27,6 @@ import com.ym.mec.jiari.JiaRiFeignService; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.ym.mec.util.collection.MapUtil; 
														 | 
														
														 | 
														
															 import com.ym.mec.util.collection.MapUtil; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.ym.mec.util.date.DateConvertor; 
														 | 
														
														 | 
														
															 import com.ym.mec.util.date.DateConvertor; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.ym.mec.util.date.DateUtil; 
														 | 
														
														 | 
														
															 import com.ym.mec.util.date.DateUtil; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															- 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import org.apache.commons.lang3.StringUtils; 
														 | 
														
														 | 
														
															 import org.apache.commons.lang3.StringUtils; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import org.springframework.beans.factory.annotation.Autowired; 
														 | 
														
														 | 
														
															 import org.springframework.beans.factory.annotation.Autowired; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import org.springframework.stereotype.Service; 
														 | 
														
														 | 
														
															 import org.springframework.stereotype.Service; 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -51,16 +50,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Autowired 
														 | 
														
														 | 
														
															     @Autowired 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     private VipGroupDao vipGroupDao; 
														 | 
														
														 | 
														
															     private VipGroupDao vipGroupDao; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Autowired 
														 | 
														
														 | 
														
															     @Autowired 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-    private VipGroupActivityDao vipGroupActivityDao; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-    @Autowired 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     private TeacherAttendanceDao teacherAttendanceDao; 
														 | 
														
														 | 
														
															     private TeacherAttendanceDao teacherAttendanceDao; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Autowired 
														 | 
														
														 | 
														
															     @Autowired 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     private MusicGroupDao musicGroupDao; 
														 | 
														
														 | 
														
															     private MusicGroupDao musicGroupDao; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Autowired 
														 | 
														
														 | 
														
															     @Autowired 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     private MusicGroupBuildLogDao musicGroupBuildLogDao; 
														 | 
														
														 | 
														
															     private MusicGroupBuildLogDao musicGroupBuildLogDao; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Autowired 
														 | 
														
														 | 
														
															     @Autowired 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-    private MusicGroupService musicGroupService; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-    @Autowired 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     private ClassGroupRelationService classGroupRelationService; 
														 | 
														
														 | 
														
															     private ClassGroupRelationService classGroupRelationService; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Autowired 
														 | 
														
														 | 
														
															     @Autowired 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     private ClassGroupStudentMapperDao classGroupStudentMapperDao; 
														 | 
														
														 | 
														
															     private ClassGroupStudentMapperDao classGroupStudentMapperDao; 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -95,8 +90,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Autowired 
														 | 
														
														 | 
														
															     @Autowired 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     private JiaRiFeignService jiaRiFeignService; 
														 | 
														
														 | 
														
															     private JiaRiFeignService jiaRiFeignService; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Autowired 
														 | 
														
														 | 
														
															     @Autowired 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-    private SysConfigService sysConfigService; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-    @Autowired 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     private CourseScheduleService courseScheduleService; 
														 | 
														
														 | 
														
															     private CourseScheduleService courseScheduleService; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Autowired 
														 | 
														
														 | 
														
															     @Autowired 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     private CourseScheduleStudentPaymentService courseScheduleStudentPaymentService; 
														 | 
														
														 | 
														
															     private CourseScheduleStudentPaymentService courseScheduleStudentPaymentService; 
														 |