Merge branch 'feature/1113-vipCourse' of http://git.dayaedu.com/yonge/cooleshow into feature/1113-vipCourse

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/CourseRepliedController.java

@@ -51,6 +51,7 @@ public class CourseRepliedController extends BaseController {
     @PostMapping(value = "/myReplied")
     public HttpResponseResult<PageInfo<MyRepliedVo>> myReplied(@RequestBody MyCourseSearch search) {
         search.setTeacherId(sysUserService.getUserId());
+        search.setCourseType(null);
         IPage<MyRepliedVo> pages = repliedService.myReplied(PageUtil.getPage(search), search);
         return succeed(PageUtil.pageInfo(pages));
     }

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

@@ -86,7 +86,8 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
             return courseHomeworkVoIPage;
         }
         List<Long> practiceRecordIdList = records.stream()
-                .filter(courseHomeworkVo -> courseHomeworkVo.getType().getCode().equals(CourseScheduleEnum.PRACTICE.getCode()))
+                .filter(courseHomeworkVo -> courseHomeworkVo.getType().getCode().equals(CourseScheduleEnum.PRACTICE.getCode())
+                || courseHomeworkVo.getType().getCode().equals(CourseScheduleEnum.VIP.getCode()))
                 .map(CourseHomeworkVo::getCourseId)
                 .collect(Collectors.toList());
 

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

@@ -141,12 +141,14 @@
         LEFT JOIN `subject` sb ON sb.id_ = g.subject_id_
         LEFT JOIN course_schedule s ON s.id_ = r.course_schedule_id_
         LEFT JOIN sys_user u ON u.id_ = r.student_id_
-        WHERE r.course_group_type_ = #{param.courseType}
-        AND r.student_replied_ != ""
+        WHERE r.student_replied_ != ""
         AND s.teacher_id_ = #{param.teacherId}
         <if test="param.studentName !=null and param.studentName !=''">
             AND u.username_ LIKE CONCAT('%', #{param.studentName}, '%')
         </if>
+        <if test="param.courseType !=null and param.courseType !=''">
+            AND r.course_group_type_ = #{param.courseType}
+        </if>
         <if test="param.classDate !=null and param.classDate !=''">
             AND DATE_FORMAT(s.class_date_,'%Y-%m') = #{param.classDate}
         </if>