Merge remote-tracking branch 'origin/master'

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

@@ -61,6 +61,9 @@ public class CourseScheduleDto extends CourseSchedule {
     @ApiModelProperty(value = "能否进行调整")
     private int enableAdjustInToday;
 
+    @ApiModelProperty(value = "老师评论id")
+    private Integer reviewId;
+
     public List<StudentNameAndPhoneDto> getStudents() {
         return students;
     }
@@ -206,4 +209,12 @@ public class CourseScheduleDto extends CourseSchedule {
     public void setClassGroupName(String classGroupName) {
         this.classGroupName = classGroupName;
     }
+
+    public Integer getReviewId() {
+        return reviewId;
+    }
+
+    public void setReviewId(Integer reviewId) {
+        this.reviewId = reviewId;
+    }
 }

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

@@ -936,6 +936,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			List<CourseScheduleReview> courseScheduleReviews = idCourseReview.get(courseScheduleDto.getId().intValue());
             if(!CollectionUtils.isEmpty(courseScheduleReviews)){
 				courseScheduleDto.setComplaintStatus(1);
+				CourseScheduleReview courseScheduleReview = courseScheduleReviews.get(0);
+				courseScheduleDto.setReviewId(courseScheduleReview.getId());
 			}else{
             	courseScheduleDto.setComplaintStatus(0);
 			}