java/PlayPai.git

			@@ -75,7 +75,8 @@


			CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingService.selectById(queryCoursePackageStudentList.getCoursePackageSchedulingId());
			List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.selectList(new QueryWrapper<CoursePackageScheduling>().eq("coursePackageId", coursePackageScheduling.getCoursePackageId()).eq("classDate", coursePackageScheduling.getClassDate()));
			List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.selectList(new QueryWrapper<CoursePackageScheduling>()
			.eq("coursePackageId", coursePackageScheduling.getCoursePackageId()).eq("classDate", coursePackageScheduling.getClassDate()));


			List<Long> ids = new ArrayList<>();
			@@ -90,12 +91,16 @@
			Integer appUserId = Integer.valueOf(map.get("appUserId").toString());
			Integer student_Id = Integer.valueOf(map.get("studentId").toString());
			TAppUser appUser = appUserClient.queryAppUser1(appUserId);
			if(null != appUser){
			map.put("userName", appUser.getName());
			map.put("phone", appUser.getPhone());
			}
			Student student = studentClient.queryStudentById(student_Id);
			map.put("userName", appUser.getName());
			map.put("phone", student.getPhone());
			map.put("studentName", student.getName());
			map.put("age", null != student.getBirthday() ? now - Integer.valueOf(sdf.format(student.getBirthday())) : "-");
			map.put("sex", student.getSex());
			if(null != student){
			map.put("studentName", student.getName());
			map.put("age", null != student.getBirthday() ? now - Integer.valueOf(sdf.format(student.getBirthday())) : "-");
			map.put("sex", student.getSex());
			}
			}
			return list;
			}
			@@ -107,7 +112,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