Merge branch 'feature/1113-vipCourse' into develop-new

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

@@ -1553,7 +1553,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             homePage.setVideoList(baseMapper.selectVideo(appAuditVersion, subjectId));
             StudentHomePage.RecentCourses recentCourses = baseMapper.selectRecentCourses(studentId);
 
-            if (CourseScheduleEnum.PRACTICE.getCode().equals(recentCourses.getCourseType()) || CourseScheduleEnum.VIP.getCode().equals(recentCourses.getCourseType())) {
+            if (recentCourses !=null && CourseScheduleEnum.PRACTICE.getCode().equals(recentCourses.getCourseType()) || CourseScheduleEnum.VIP.getCode().equals(recentCourses.getCourseType())) {
                 SysUser sysUser = sysUserService.getByUserId(recentCourses.getTeacherId());
                 if (sysUser != null) {
                     recentCourses.setCourseGroupName(recentCourses.getCourseGroupName() + "-" + sysUser.getUsername());
@@ -1584,16 +1584,12 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             }
 
             // 本周未上课程数
-            if (coursesPractice != null) {
 
-                if (CourseScheduleEnum.PRACTICE.getCode().equals(coursesPractice.getCourseType()) || CourseScheduleEnum.VIP.getCode().equals(coursesPractice.getCourseType())) {
-                    SysUser sysUser = sysUserService.getByUserId(coursesPractice.getStudentId());
-                    if (sysUser != null) {
-                        coursesPractice.setCourseGroupName(coursesPractice.getCourseGroupName() + "-" + sysUser.getUsername());
-                    }
+            if (coursesPractice != null && CourseScheduleEnum.PRACTICE.getCode().equals(coursesPractice.getCourseType()) || CourseScheduleEnum.VIP.getCode().equals(coursesPractice.getCourseType())) {
+                SysUser sysUser = sysUserService.getByUserId(coursesPractice.getStudentId());
+                if (sysUser != null) {
+                    coursesPractice.setCourseGroupName(coursesPractice.getCourseGroupName() + "-" + sysUser.getUsername());
                 }
-
-                coursesPractice.setNotStartCount(getWeekNotStart(teacherId));
             }
         }
         return homePage;

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

@@ -1035,6 +1035,9 @@
             <if test="param.courseType != null and param.courseType != ''">
                 AND cg.type_ = #{param.courseType}
             </if>
+            <if test="param.search != null and param.search != ''">
+                AND cg.name_ LIKE concat('%',#{param.search},'%')
+            </if>
         </where>
     </select>
     <select id="studentCourseGroup"
@@ -1044,6 +1047,7 @@
                cg.complete_course_num_ completeCourseNum,cg.course_num_ courseNum,
                cg.id_ courseGroupId,cg.course_plan_ coursePlan,cg.teacher_id_ teacherId
         from course_group cg
+        LEFT JOIN sys_user su ON cg.teacher_id_ = su.id_
         left join course_schedule_student_payment cssp ON cssp.course_group_id_ = cg.id_
         <where>
             <if test="param.teacherId != null">
@@ -1064,6 +1068,9 @@
             <if test="param.courseType != null and param.courseType != ''">
                 AND cg.type_ = #{param.courseType}
             </if>
+            <if test="param.search != null and param.search != ''">
+                AND (cg.name_ LIKE concat('%',#{param.search},'%') OR su.username_ LIKE concat('%',#{param.search},'%'))
+            </if>
         </where>
         GROUP BY cg.id_
     </select>

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

@@ -673,6 +673,7 @@
         LEFT JOIN course_group g ON p.course_group_id_=g.id_
         WHERE p.user_id_=#{studentId}
         AND s.status_ IN ('ING','NOT_START') and g.status_='ING'
+        and date_format(s.class_date_,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d')
         ORDER BY ABS(NOW() - s.start_time_) ASC
         limit 1
     </select>
@@ -696,6 +697,7 @@
         WHERE s.teacher_id_=#{teacherId}
         AND s.type_ IN ('PRACTICE','VIP')
         AND s.status_ IN ('ING','NOT_START') and g.status_='ING'
+        and date_format(s.class_date_,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d')
         ORDER BY ABS(NOW() - s.start_time_) ASC
         limit 1
     </select>
@@ -718,6 +720,7 @@
         WHERE s.teacher_id_=#{teacherId}
         AND s.type_ IN ('LIVE','PIANO_ROOM_CLASS')
         AND s.status_ IN ('ING','NOT_START')  and g.status_='ING'
+        and date_format(s.class_date_,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d')
         ORDER BY ABS(NOW() - s.start_time_) ASC
         limit 1
     </select>