Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseStudent.java

@@ -59,6 +59,28 @@ public class CourseStudent implements Serializable {
     @ApiModelProperty(value = "直播课成课后生成的im群id")
     private String imGroupId;
 
+    @ApiModelProperty(value = "学生评价 0:未评价 1:已评价")
+    private Integer studentReplied;
+
+    @ApiModelProperty(value = "老师评价 0:未评价 1:已评价")
+    private Integer teacherReplied;
+
+    public Integer getStudentReplied() {
+        return studentReplied;
+    }
+
+    public void setStudentReplied(Integer studentReplied) {
+        this.studentReplied = studentReplied;
+    }
+
+    public Integer getTeacherReplied() {
+        return teacherReplied;
+    }
+
+    public void setTeacherReplied(Integer teacherReplied) {
+        this.teacherReplied = teacherReplied;
+    }
+
     public String getRealName() {
         return realName;
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -315,11 +315,14 @@
             p.payCount AS payCount,
             g.background_pic_ AS cover,
             g.subject_id_ AS subjectId,
-            sb.name_ AS subjectName
+            sb.name_ AS subjectName,
+            (r.student_replied_ IS NOT NULL) AS studentReplied,
+            (r.teacher_replied_ IS NOT NULL) AS teacherReplied
         FROM course_schedule cs
         LEFT JOIN course_group g ON cs.course_group_id_ = g.id_
         LEFT JOIN (SELECT course_id_ AS pid,count(*) AS payCount FROM course_schedule_student_payment GROUP BY course_id_ ) p ON cs.id_=p.pid
         LEFT JOIN `subject` sb ON g.subject_id_=sb.id_
+        LEFT JOIN course_schedule_replied r ON cs.id_ = r.course_schedule_id_
         WHERE cs.lock_=0
         AND cs.status_ IN ('ING','COMPLETE','NOT_START')
         AND cs.type_='LIVE'
@@ -348,12 +351,15 @@
             NULL AS payCount,
             u.avatar_ AS cover,
             g.subject_id_ AS subjectId,
-            sb.name_ AS subjectName
+            sb.name_ AS subjectName,
+            (r.student_replied_ IS NOT NULL) AS studentReplied,
+            (r.teacher_replied_ IS NOT NULL) AS teacherReplied
         FROM course_schedule_student_payment p
         LEFT JOIN sys_user u ON p.user_id_ =u.id_
         LEFT JOIN course_schedule cs ON p.course_id_=cs.id_
         LEFT JOIN course_group g ON p.course_group_id_ = g.id_
         LEFT JOIN `subject` sb ON g.subject_id_=sb.id_
+        LEFT JOIN course_schedule_replied r ON cs.id_ = r.course_schedule_id_
         WHERE cs.lock_=0
         AND cs.status_ IN ('ING','COMPLETE','NOT_START')
         AND p.course_id_ IN (SELECT s.id_ FROM course_schedule s WHERE s.type_='PRACTICE' AND s.teacher_id_=#{param.teacherId})
@@ -439,11 +445,14 @@
             u.real_name_ AS realName,
             u.avatar_ AS cover,
             g.subject_id_ AS subjectId,
-            b.name_ AS subjectName
+            b.name_ AS subjectName,
+            (r.student_replied_ IS NOT NULL) AS studentReplied,
+            (r.teacher_replied_ IS NOT NULL) AS teacherReplied
         FROM course_schedule s
         LEFT JOIN sys_user u ON s.teacher_id_ = u.id_
         LEFT JOIN course_group g ON s.course_group_id_ = g.id_
         LEFT JOIN `subject` b ON g.subject_id_ = b.id_
+        LEFT JOIN course_schedule_replied r ON s.id_ = r.course_schedule_id_
         WHERE s.lock_=0
         AND s.status_ IN ('ING','NOT_START','COMPLETE')
         AND s.id_ IN
@@ -463,10 +472,13 @@
             NULL AS realName,
             g.background_pic_ AS cover,
             g.subject_id_ AS subjectId,
-            sb.name_ AS subjectName
+            sb.name_ AS subjectName,
+            (r.student_replied_ IS NOT NULL) AS studentReplied,
+            (r.teacher_replied_ IS NOT NULL) AS teacherReplied
         FROM course_schedule s
         LEFT JOIN course_group g ON s.course_group_id_ = g.id_
         LEFT JOIN `subject` sb ON g.subject_id_=sb.id_
+        LEFT JOIN course_schedule_replied r ON s.id_ = r.course_schedule_id_
         WHERE s.lock_=0
         AND s.status_ IN ('ING','NOT_START','COMPLETE')
         AND s.id_ IN