|
@@ -468,25 +468,23 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
|
|
|
throw new BizException("评价不存在");
|
|
|
}
|
|
|
|
|
|
- if (courseScheduleReview == null) {
|
|
|
- courseScheduleReview = new CourseScheduleReview();
|
|
|
- }
|
|
|
-
|
|
|
TeacherClassHeadInfo teacherClassGroupInfo = getCourseInfoHead(courseId.intValue());
|
|
|
-
|
|
|
- CourseHomework homework = courseHomeworkDao.findByCourseSchedule(courseId);
|
|
|
- if (homework != null) {
|
|
|
- courseScheduleReview.setHomeWork(homework.getContent());
|
|
|
- }
|
|
|
- courseScheduleReview.setTeacherName(teacherClassGroupInfo.getBishopTeacher());
|
|
|
- CourseSchedule courseSchedule = courseScheduleDao.get(courseId);
|
|
|
- if (courseSchedule.getGroupType().equals(GroupType.PRACTICE)) {
|
|
|
- PracticeCourseDto practiceGroup = practiceGroupDao.findByGroupId(Integer.parseInt(courseSchedule.getMusicGroupId()));
|
|
|
- courseScheduleReview.setEduTeacherName(practiceGroup.getEduTeacherName());
|
|
|
- }
|
|
|
ReviewInfoDto reviewInfoDto = new ReviewInfoDto();
|
|
|
reviewInfoDto.setTeacherClassHeadInfo(teacherClassGroupInfo);
|
|
|
- reviewInfoDto.setCourseScheduleReview(courseScheduleReview);
|
|
|
+
|
|
|
+ if (courseScheduleReview != null) {
|
|
|
+ CourseHomework homework = courseHomeworkDao.findByCourseSchedule(courseId);
|
|
|
+ if (homework != null) {
|
|
|
+ courseScheduleReview.setHomeWork(homework.getContent());
|
|
|
+ }
|
|
|
+ courseScheduleReview.setTeacherName(teacherClassGroupInfo.getBishopTeacher());
|
|
|
+ CourseSchedule courseSchedule = courseScheduleDao.get(courseId);
|
|
|
+ if (courseSchedule.getGroupType().equals(GroupType.PRACTICE)) {
|
|
|
+ PracticeCourseDto practiceGroup = practiceGroupDao.findByGroupId(Integer.parseInt(courseSchedule.getMusicGroupId()));
|
|
|
+ courseScheduleReview.setEduTeacherName(practiceGroup.getEduTeacherName());
|
|
|
+ }
|
|
|
+ reviewInfoDto.setCourseScheduleReview(courseScheduleReview);
|
|
|
+ }
|
|
|
|
|
|
if (courseScheduleComplaint != null) {
|
|
|
List<CourseScheduleComplaintsDto> courseScheduleComplaints = new ArrayList<>();
|