Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/LiveRoomServiceImpl.java

@@ -121,7 +121,6 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
      * 主讲人查询并校验房间信息
      *
      * @param roomUid 房间uid
-     * @param userId  主讲人id
      * @return
      */
     @Override

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

@@ -37,6 +37,12 @@ public class LiveCourseInfoVo extends CourseGroupVo implements Serializable {
         @ApiModelProperty(value = "教学计划/最多200字")
         private String plan;
 
+        @ApiModelProperty(value = "房间uid")
+        private String roomUid;
+
+        @ApiModelProperty(value = "直播状态 0未开始 1已开始 2已结束")
+        private Integer liveState;
+
         public Long getId() {
             return planId;
         }
@@ -76,6 +82,22 @@ public class LiveCourseInfoVo extends CourseGroupVo implements Serializable {
         public void setPlan(String plan) {
             this.plan = plan;
         }
+
+        public String getRoomUid() {
+            return roomUid;
+        }
+
+        public void setRoomUid(String roomUid) {
+            this.roomUid = roomUid;
+        }
+
+        public Integer getLiveState() {
+            return liveState;
+        }
+
+        public void setLiveState(Integer liveState) {
+            this.liveState = liveState;
+        }
     }
 
     @ApiModel(value = "CourseBuyStudentVo", description = "学员列表")

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

@@ -30,10 +30,13 @@
                a.class_num_,
                b.id_ as courseId,
                b.start_time_,
-               b.end_time_
+               b.end_time_,
+               c.room_uid_ as roomUid,
+               IFNULL(c.live_state_,0) as liveState
         from course_plan as a
                  left join course_schedule as b on a.course_group_id_ = b.course_group_id_
                  AND a.class_num_ = b.class_num_
+                 left join live_room as c on b.id_ = c.course_id_
         where a.course_group_id_ = #{groupId}
         order by b.start_time_
     </select>

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

@@ -9,8 +9,7 @@
             su.avatar_ AS avatar,
             su.phone_ AS phone,
             (SELECT group_concat(name_) FROM `subject` WHERE find_in_set(id_,s.subject_id_)) AS subjectName,
-    --         IFNULL(TIMESTAMPDIFF(DAY,b.last_end_class_,NOW()),TIMESTAMPDIFF(DAY,b.created_time_,NOW())) AS lastEndClass
-            TIMESTAMPDIFF(DAY,b.last_end_class_,NOW()) AS lastEndClass
+            DATEDIFF(NOW(),b.last_end_class_) AS lastEndClass
         FROM user_binding_teacher b
         LEFT JOIN sys_user su ON b.student_id_=su.id_
         LEFT JOIN student s ON b.student_id_=s.user_id_