zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

Browse Source
This commit is contained in:
wuchunlei
2024-04-03 09:09:28 +08:00
parent 015d8a9732 20bcc445da
commit 145e062ebe
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/common/entity/CourseEntity.java
View File

@@ -21,6 +21,8 @@ public class CourseEntity {
private String title; private String title;
private Integer sort;
private Date createTime; private Date createTime;
@TableLogic @TableLogic

8
src/main/java/com/peanut/modules/master/controller/CourseController.java
View File

@@ -107,14 +107,14 @@ public class CourseController {
@RequestMapping("/getCourseCatalogueChapterVideoList") @RequestMapping("/getCourseCatalogueChapterVideoList")
public R getCourseCatalogueChapterVideoList(@RequestBody ParamTo param){ public R getCourseCatalogueChapterVideoList(@RequestBody ParamTo param){
courseCatalogueChapterVideoService.getCourseCatalogueChapterVideoList(param); Page courseCatalogueChapterVideoList = courseCatalogueChapterVideoService.getCourseCatalogueChapterVideoList(param);
return R.ok(); return R.ok().put("page",courseCatalogueChapterVideoList);
} }
@RequestMapping("/addCourseCatalogueChapterVideo") @RequestMapping("/addCourseCatalogueChapterVideo")
public R addCourseCatalogueChapterVideo(@RequestBody CourseCatalogueChapterVideoEntity courseCatalogueChapterVideoEntity){ public R addCourseCatalogueChapterVideo(@RequestBody CourseCatalogueChapterVideoEntity courseCatalogueChapterVideoEntity){
courseCatalogueChapterVideoService.save(courseCatalogueChapterVideoEntity); boolean save = courseCatalogueChapterVideoService.save(courseCatalogueChapterVideoEntity);
return R.ok(); return save?R.ok():R.error("error");
} }
@RequestMapping("/delCourseCatalogueChapterVideo") @RequestMapping("/delCourseCatalogueChapterVideo")

2
src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java
View File

@@ -74,7 +74,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
if(ObjectUtils.isNotBlank(map,"keywords")){ if(ObjectUtils.isNotBlank(map,"keywords")){
wrapper.like(CourseEntity::getTitle,map.get("keywords").toString()); wrapper.like(CourseEntity::getTitle,map.get("keywords").toString());
} }
wrapper.orderByAsc(CourseEntity::getSort);
Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectPage(new Page<>(page, limit), wrapper); Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectPage(new Page<>(page, limit), wrapper);
for (CourseEntity c:courseEntityPage.getRecords()){ for (CourseEntity c:courseEntityPage.getRecords()){
List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, c.getId()).orderByAsc(CourseCatalogueEntity::getSort)); List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, c.getId()).orderByAsc(CourseCatalogueEntity::getSort));