Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ReviewInfoDto.java

@@ -8,7 +8,7 @@ public class ReviewInfoDto {
     @ApiModelProperty(value = "课程信息",required = false)
     private TeacherClassHeadInfo teacherClassHeadInfo;
 
-    @ApiModelProperty(value = "评价信息",required = false)
+    @ApiModelProperty(value = "老师评价信息",required = false)
     private CourseScheduleReview courseScheduleReview;
 
     public TeacherClassHeadInfo getTeacherClassHeadInfo() {

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherClassHeadInfo.java

@@ -46,6 +46,9 @@ public class TeacherClassHeadInfo {
     @ApiModelProperty(value = "下课时间",required = false)
     private String endClassTime;
 
+    @ApiModelProperty(value = "班级名称",required = false)
+    private String classGroupName;
+
 
     public Integer getTotalClassTimes() {
         return totalClassTimes;
@@ -142,4 +145,12 @@ public class TeacherClassHeadInfo {
     public void setClassDate(String classDate) {
         this.classDate = classDate;
     }
+
+    public String getClassGroupName() {
+        return classGroupName;
+    }
+
+    public void setClassGroupName(String classGroupName) {
+        this.classGroupName = classGroupName;
+    }
 }

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

@@ -206,12 +206,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
         }
         CourseHomework homework = courseHomeworkDao.findByCourseSchedule(courseScheduleReview.getCourseScheduleId().longValue());
         courseScheduleReview.setHomeWork(homework.getContent());
-        CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleReview.getCourseScheduleId().longValue());
-
-        TeacherClassHeadInfo teacherClassGroupInfo = classGroupService.findTeacherClassGroupInfo(courseScheduleReview.getClassGroupId().longValue());
-        teacherClassGroupInfo.setClassDate(courseSchedule.getClassDate().toString());
-        teacherClassGroupInfo.setStartClassTime(courseSchedule.getStartClassTime().toString());
-        teacherClassGroupInfo.setEndClassTime(courseSchedule.getEndClassTime().toString());
+        TeacherClassHeadInfo teacherClassGroupInfo = getCourseInfoHead(courseScheduleReview.getCourseScheduleId());
 
         ReviewInfoDto reviewInfoDto = new ReviewInfoDto();
         reviewInfoDto.setCourseScheduleReview(courseScheduleReview);
@@ -222,10 +217,12 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
     @Override
     public TeacherClassHeadInfo getCourseInfoHead(Integer id) {
         CourseSchedule courseSchedule = courseScheduleDao.get(id.longValue());
+        ClassGroup classGroup = classGroupService.get(courseSchedule.getClassGroupId());
         TeacherClassHeadInfo teacherClassGroupInfo = classGroupService.findTeacherClassGroupInfo(courseSchedule.getClassGroupId().longValue());
-        teacherClassGroupInfo.setClassDate(courseSchedule.getClassDate().toString());
-        teacherClassGroupInfo.setStartClassTime(courseSchedule.getStartClassTime().toString());
-        teacherClassGroupInfo.setEndClassTime(courseSchedule.getEndClassTime().toString());
+        teacherClassGroupInfo.setClassDate(DateUtil.dateToString(courseSchedule.getClassDate(),"yyyy年MM月dd日"));
+        teacherClassGroupInfo.setStartClassTime(DateUtil.dateToString(courseSchedule.getStartClassTime(),"HH:mm"));
+        teacherClassGroupInfo.setEndClassTime(DateUtil.dateToString(courseSchedule.getEndClassTime(),"HH:mm"));
+        teacherClassGroupInfo.setClassGroupName(classGroup.getName());
         return teacherClassGroupInfo;
     }
 

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

@@ -0,0 +1,41 @@
+package com.ym.mec.student.controller;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.page.CourseReviewQueryInfo;
+import com.ym.mec.biz.service.CourseReviewService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+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.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Arrays;
+import java.util.List;
+
+@RequestMapping("courseReview")
+@Api(tags = "课程评价")
+@RestController
+public class CourseReviewController extends BaseController {
+
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @Autowired
+    private CourseReviewService courseReviewService;
+
+
+    @ApiOperation(value = "评论详情")
+    @GetMapping("getReviewInfo")
+    public HttpResponseResult getReviewInfo(int id) {
+        return succeed(courseReviewService.getReviewInfo(id));
+    }
+
+}