diff --git a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java index 6f40d178..63d34b30 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java @@ -21,6 +21,8 @@ public class CourseEntity { private String title; + private Integer sort; + private Date createTime; @TableLogic diff --git a/src/main/java/com/peanut/modules/master/controller/CourseController.java b/src/main/java/com/peanut/modules/master/controller/CourseController.java index cf4aa09c..875e63c6 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseController.java @@ -107,14 +107,14 @@ public class CourseController { @RequestMapping("/getCourseCatalogueChapterVideoList") public R getCourseCatalogueChapterVideoList(@RequestBody ParamTo param){ - courseCatalogueChapterVideoService.getCourseCatalogueChapterVideoList(param); - return R.ok(); + Page courseCatalogueChapterVideoList = courseCatalogueChapterVideoService.getCourseCatalogueChapterVideoList(param); + return R.ok().put("page",courseCatalogueChapterVideoList); } @RequestMapping("/addCourseCatalogueChapterVideo") public R addCourseCatalogueChapterVideo(@RequestBody CourseCatalogueChapterVideoEntity courseCatalogueChapterVideoEntity){ - courseCatalogueChapterVideoService.save(courseCatalogueChapterVideoEntity); - return R.ok(); + boolean save = courseCatalogueChapterVideoService.save(courseCatalogueChapterVideoEntity); + return save?R.ok():R.error("error"); } @RequestMapping("/delCourseCatalogueChapterVideo") diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java index 8f45e8ce..ce409daf 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java @@ -74,7 +74,7 @@ public class CourseServiceImpl extends ServiceImpl impl if(ObjectUtils.isNotBlank(map,"keywords")){ wrapper.like(CourseEntity::getTitle,map.get("keywords").toString()); } - + wrapper.orderByAsc(CourseEntity::getSort); Page courseEntityPage = this.getBaseMapper().selectPage(new Page<>(page, limit), wrapper); for (CourseEntity c:courseEntityPage.getRecords()){ List courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper().eq(CourseCatalogueEntity::getCourseId, c.getId()).orderByAsc(CourseCatalogueEntity::getSort));