|
@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.validation.Valid;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Objects;
|
|
|
|
|
@@ -95,6 +96,12 @@ public class CourseHomeworkController extends BaseController {
|
|
|
query.setStudentId(sysUserService.getUserId());
|
|
|
query.setClientType("STUDENT");
|
|
|
query.setCourseStatus(CourseScheduleEnum.COMPLETE);
|
|
|
+ List<CourseScheduleEnum> list = new ArrayList<>();
|
|
|
+ list.add(CourseScheduleEnum.PIANO_ROOM_CLASS);
|
|
|
+ list.add(CourseScheduleEnum.PRACTICE);
|
|
|
+ list.add(CourseScheduleEnum.VIP);
|
|
|
+ list.add(CourseScheduleEnum.GROUP);
|
|
|
+ query.setCourseType(list);
|
|
|
|
|
|
IPage<CourseHomeworkVo> page = courseHomeworkService.selectPage(PageUtil.getPage(query), query);
|
|
|
List<CourseHomeworkVo> records = page.getRecords();
|