|
@@ -459,14 +459,21 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
|
|
|
|
|
|
@Override
|
|
|
public ReviewInfoDto getStuAndTeaReviewInfo(Long courseId, Integer userId) {
|
|
|
+ //老师评价
|
|
|
CourseScheduleReview courseScheduleReview = courseScheduleReviewDao.findByCourseScheduleAndStudent(courseId, userId);
|
|
|
- TeacherClassHeadInfo teacherClassGroupInfo = getCourseInfoHead(courseId.intValue());
|
|
|
+ //学生评价
|
|
|
+ CourseScheduleComplaintsDto courseScheduleComplaint = courseScheduleComplaintsDao.findByUserIdAndCourseId(userId.longValue(), courseId);
|
|
|
+
|
|
|
+ if (courseScheduleReview == null && courseScheduleComplaint == null) {
|
|
|
+ throw new BizException("评价不存在");
|
|
|
+ }
|
|
|
|
|
|
- ReviewInfoDto reviewInfoDto = new ReviewInfoDto();
|
|
|
- reviewInfoDto.setTeacherClassHeadInfo(teacherClassGroupInfo);
|
|
|
if (courseScheduleReview == null) {
|
|
|
courseScheduleReview = new CourseScheduleReview();
|
|
|
}
|
|
|
+
|
|
|
+ TeacherClassHeadInfo teacherClassGroupInfo = getCourseInfoHead(courseId.intValue());
|
|
|
+
|
|
|
CourseHomework homework = courseHomeworkDao.findByCourseSchedule(courseId);
|
|
|
if (homework != null) {
|
|
|
courseScheduleReview.setHomeWork(homework.getContent());
|
|
@@ -477,10 +484,10 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
|
|
|
PracticeCourseDto practiceGroup = practiceGroupDao.findByGroupId(Integer.parseInt(courseSchedule.getMusicGroupId()));
|
|
|
courseScheduleReview.setEduTeacherName(practiceGroup.getEduTeacherName());
|
|
|
}
|
|
|
+ ReviewInfoDto reviewInfoDto = new ReviewInfoDto();
|
|
|
+ reviewInfoDto.setTeacherClassHeadInfo(teacherClassGroupInfo);
|
|
|
reviewInfoDto.setCourseScheduleReview(courseScheduleReview);
|
|
|
|
|
|
- //学生评价
|
|
|
- CourseScheduleComplaintsDto courseScheduleComplaint = courseScheduleComplaintsDao.findByUserIdAndCourseId(userId.longValue(), courseId);
|
|
|
if (courseScheduleComplaint != null) {
|
|
|
List<CourseScheduleComplaintsDto> courseScheduleComplaints = new ArrayList<>();
|
|
|
courseScheduleComplaints.add(courseScheduleComplaint);
|