diff --git a/src/main/java/com/peanut/modules/common/entity/CourseToSociologyEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseToSociologyEntity.java index 863cd9f4..c98832bb 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseToSociologyEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseToSociologyEntity.java @@ -17,6 +17,8 @@ public class CourseToSociologyEntity { private Integer sociologyId; + private Integer sort; + private Date createTime; @TableLogic diff --git a/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java b/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java index c68bf056..eeb39f78 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java @@ -77,4 +77,10 @@ public class CourseSociologyController { } } + @RequestMapping("/updateCourseToSociologySort") + public R updateCourseToSociologySort(@RequestBody CourseToSociologyEntity courseToSociologyEntity){ + courseToSociologyService.updateById(courseToSociologyEntity); + return R.ok(); + } + } 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 9e1a1050..d927bd07 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 @@ -105,6 +105,7 @@ public class CourseServiceImpl extends ServiceImpl impl wrapper.selectAs(CourseToSociologyEntity::getId,"bindId"); wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseToSociologyEntity::getCourseId); wrapper.eq(CourseToSociologyEntity::getSociologyId,sociologyId); + wrapper.orderByAsc(CourseToSociologyEntity::getSort); List courseEntities = courseToSociologyDao.selectJoinList(CourseEntity.class, wrapper); return courseEntities; }