diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnDao.java index f96ac9c8..fb7808aa 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnDao.java @@ -30,7 +30,7 @@ public interface TeacherOpenCourseHandsOnDao extends BaseMapper getValuesByQuery(TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery); List getValuesByQueryNotWithPermission(TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery); - List getHandsOnList(GetHandsOnListParam param); + PageQuery getHandsOnList(PageQuery query); List> getExcelValues(TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery); diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java index d5e7d45d..44880371 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java @@ -192,8 +192,9 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService getHandsOnList(GetHandsOnListParam param) { - List teacherOpenCourseHandsOnLists = teacherOpenCourseHandsOnDao.getHandsOnList(param); + public PageQuery getHandsOnList(GetHandsOnListParam param) { + PageQuery teacherOpenCourseHandsOns = teacherOpenCourseHandsOnDao.getHandsOnList(param.getPageQuery()); + List teacherOpenCourseHandsOnLists = teacherOpenCourseHandsOns.getList(); List handIds = teacherOpenCourseHandsOnLists.stream().map(v -> v.getHandsOnId()).collect(Collectors.toList()); List achievementList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(handIds)) { @@ -212,7 +213,8 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService> getExcelValues(TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery) { @@ -248,7 +250,8 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService teacherOpenCourseHandsOnLists = teacherOpenCourseHandsOnDao.getHandsOnList(param); + PageQuery teacherOpenCourseHandsOns = teacherOpenCourseHandsOnDao.getHandsOnList(param.getPageQuery()); + List teacherOpenCourseHandsOnLists = teacherOpenCourseHandsOns.getList(); List handIds = teacherOpenCourseHandsOnLists.stream().map(v -> v.getHandsOnId()).collect(Collectors.toList()); List achievementList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(handIds)) { diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java index 235f03c9..09533290 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java @@ -228,11 +228,11 @@ public class TeacherOpenCourseHandsOnController{ * @return */ @GetMapping(MODEL + "/getHandsOnList.do") - public JsonResult> getHandsOnList(GetHandsOnListParam param, @SCoreUser CoreUser coreUser) { + public JsonResult> getHandsOnList(GetHandsOnListParam param, @SCoreUser CoreUser coreUser) { if(null == coreUser){ return JsonResult.failMessage("请登录后再操作"); }else{ - Listlist = teacherOpenCourseHandsOnService.getHandsOnList(param); + PageQuery list = teacherOpenCourseHandsOnService.getHandsOnList(param); return JsonResult.success(list); } }