老师端最近课程

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

@@ -1560,11 +1560,10 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
 
             if (coursesPractice == null && coursesLive != null) {
                 homePage.setRecentCourses(coursesLive);
-            }
+            } else
             if (coursesPractice != null && coursesLive == null) {
                 homePage.setRecentCourses(coursesPractice);
-            }
-
+            } else
             if (coursesPractice != null && coursesLive != null) {
                 Date practiceTime = coursesPractice.getCourseStartTime();
                 Date liveTime = coursesLive.getCourseStartTime();
@@ -1575,6 +1574,9 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                     homePage.setRecentCourses(coursesLive);
                 }
             }
+
+            // 本周未上课程数
+            coursesPractice.setNotStartCount(getWeekNotStart(teacherId));
         }
         return homePage;
     }

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

@@ -47,6 +47,9 @@ public class StudentHomePage implements Serializable {
         private String status;
         @ApiModelProperty(value = "开课时间")
         private Date courseStartTime;
+
+        @ApiModelProperty(value = "本周未上课程数")
+        private Integer notStartCount;
     }
 
     @Data

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

@@ -694,7 +694,7 @@
         LEFT JOIN course_schedule_student_payment p ON s.id_=p.course_id_
         WHERE s.teacher_id_=#{teacherId}
         AND s.type_ IN ('PRACTICE','VIP')
-        AND s.status_ = 'ING'
+        AND s.status_ IN ('ING','NOT_START') and g.status_='ING'
         ORDER BY ABS(NOW() - s.start_time_) ASC
         limit 1
     </select>
@@ -716,7 +716,7 @@
         LEFT JOIN course_group g ON s.course_group_id_=g.id_
         WHERE s.teacher_id_=#{teacherId}
         AND s.type_ IN ('LIVE','PIANO_ROOM_CLASS')
-        AND s.status_ ='ING'
+        AND s.status_ IN ('ING','NOT_START')  and g.status_='ING'
         ORDER BY ABS(NOW() - s.start_time_) ASC
         limit 1
     </select>