java/PlayPai.git

			@@ -47,12 +47,12 @@
			private StudentClient studentClient;



			@Autowired
			private CoursePackageSchedulingMapper coursePackageSchedulingService;

			/**
			* 获取排课预约数据
			*
			* @param queryCoursePackageStudentList
			* @return
			*/
			@@ -60,15 +60,15 @@
			public List<Map<String, Object>> queryCoursePackageStudentList(Page<Map<String, Object>> page, QueryCoursePackageStudentList queryCoursePackageStudentList) {
			List<Integer> userId = null;
			List<Integer> studentId = null;
			if(ToolUtil.isNotEmpty(queryCoursePackageStudentList.getUserName())){
			if (ToolUtil.isNotEmpty(queryCoursePackageStudentList.getUserName())) {
			List<AppUser> appUsers = appUserClient.queryAppUserListByName(queryCoursePackageStudentList.getUserName());
			if(appUsers.size() > 0){
			if (appUsers.size() > 0) {
			userId = appUsers.stream().map(AppUser::getId).collect(Collectors.toList());
			}
			}
			if(ToolUtil.isNotEmpty(queryCoursePackageStudentList.getStudentName())){
			if (ToolUtil.isNotEmpty(queryCoursePackageStudentList.getStudentName())) {
			List<Student> students = studentClient.queryStudentListByName(queryCoursePackageStudentList.getStudentName());
			if(students.size() > 0){
			if (students.size() > 0) {
			studentId = students.stream().map(Student::getId).collect(Collectors.toList());
			}
			}
			@@ -107,7 +107,11 @@

			@Override
			public List<ClassListDto> getClassList(Integer tStudentId) {
			return this.baseMapper.getClassList(tStudentId);
			List<ClassListDto> classList = this.baseMapper.getClassList(tStudentId);
			List<ClassListDto> holiList = this.baseMapper.getHoliList(tStudentId);
			classList.addAll(holiList);

			return classList;
			}

			@Override