旧入口兼容

mec-biz/src/main/java/com/ym/mec/biz/service/CourseReviewService.java

@@ -82,4 +82,11 @@ public interface CourseReviewService extends BaseService<Integer, CourseSchedule
 	 */
 	List<CourseScheduleReview> batchAdd(Integer teacherId, List<CourseScheduleReview> courseScheduleReviewList);
 
+	/**
+	 * 根据课程id获取老师和学生对应评价
+	 * @param courseId
+	 * @return
+	 */
+	ReviewInfoDto getStuAndTeaReviewInfo(Long courseId,Integer userId);
+
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseReviewServiceImpl.java

@@ -252,14 +252,14 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
             throw new BizException("评价不存在");
         }
         CourseHomework homework = courseHomeworkDao.findByCourseSchedule(courseScheduleReview.getCourseScheduleId().longValue());
-        if(homework != null){
-        	courseScheduleReview.setHomeWork(homework.getContent());
+        if (homework != null) {
+            courseScheduleReview.setHomeWork(homework.getContent());
         }
         TeacherClassHeadInfo teacherClassGroupInfo = getCourseInfoHead(courseScheduleReview.getCourseScheduleId());
         courseScheduleReview.setTeacherName(teacherClassGroupInfo.getBishopTeacher());
 
         CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleReview.getCourseScheduleId().longValue());
-        if(courseSchedule.getGroupType().equals(GroupType.PRACTICE)){
+        if (courseSchedule.getGroupType().equals(GroupType.PRACTICE)) {
             PracticeCourseDto practiceGroup = practiceGroupDao.findByGroupId(Integer.parseInt(courseSchedule.getMusicGroupId()));
             courseScheduleReview.setEduTeacherName(practiceGroup.getEduTeacherName());
         }
@@ -456,4 +456,35 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
         }
         return courseScheduleReviewList;
     }
+
+    @Override
+    public ReviewInfoDto getStuAndTeaReviewInfo(Long courseId, Integer userId) {
+        CourseScheduleReview courseScheduleReview = courseScheduleReviewDao.findByCourseScheduleAndStudent(courseId, userId);
+        TeacherClassHeadInfo teacherClassGroupInfo = getCourseInfoHead(courseId.intValue());
+
+        ReviewInfoDto reviewInfoDto = new ReviewInfoDto();
+        reviewInfoDto.setTeacherClassHeadInfo(teacherClassGroupInfo);
+        if (courseScheduleReview != null) {
+            CourseHomework homework = courseHomeworkDao.findByCourseSchedule(courseScheduleReview.getCourseScheduleId().longValue());
+            if (homework != null) {
+                courseScheduleReview.setHomeWork(homework.getContent());
+            }
+            courseScheduleReview.setTeacherName(teacherClassGroupInfo.getBishopTeacher());
+            CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleReview.getCourseScheduleId().longValue());
+            if (courseSchedule.getGroupType().equals(GroupType.PRACTICE)) {
+                PracticeCourseDto practiceGroup = practiceGroupDao.findByGroupId(Integer.parseInt(courseSchedule.getMusicGroupId()));
+                courseScheduleReview.setEduTeacherName(practiceGroup.getEduTeacherName());
+            }
+            reviewInfoDto.setCourseScheduleReview(courseScheduleReview);
+        }
+
+        //学生评价
+        CourseScheduleComplaintsDto courseScheduleComplaint = courseScheduleComplaintsDao.findByUserIdAndCourseId(userId.longValue(), courseId);
+        if (courseScheduleComplaint != null) {
+            List<CourseScheduleComplaintsDto> courseScheduleComplaints = new ArrayList<>();
+            courseScheduleComplaints.add(courseScheduleComplaint);
+            reviewInfoDto.setCourseScheduleComplaints(courseScheduleComplaints);
+        }
+        return reviewInfoDto;
+    }
 }

mec-student/src/main/java/com/ym/mec/student/controller/CourseReviewController.java

@@ -12,6 +12,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,4 +39,14 @@ public class CourseReviewController extends BaseController {
         return succeed(courseReviewService.getReviewInfo(id));
     }
 
+    @ApiOperation(value = "获取老师评价和学生评价")
+    @GetMapping("getStuAndTeaReviewInfo")
+    public HttpResponseResult getStuAndTeaReviewInfo(Long courseId) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return succeed(courseReviewService.getStuAndTeaReviewInfo(courseId,sysUser.getId()));
+    }
+
 }