From f0683848f57166eed1466978d61edd9d1e3e6de5 Mon Sep 17 00:00:00 2001
From: xuliangtong <1124839262@qq.com>
Date: Mon, 14 Nov 2022 22:32:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ibeetl/jlw/dao/TeacherOpenCourseHandsOnDao.java   |  2 +-
 .../jlw/service/TeacherOpenCourseHandsOnService.java  | 11 +++++++----
 .../jlw/web/TeacherOpenCourseHandsOnController.java   |  4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

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<TeacherOpenCours
     List<TeacherOpenCourseHandsOn> getValuesByQuery(TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery);
     List<TeacherOpenCourseHandsOn> getValuesByQueryNotWithPermission(TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery);
 
-    List<TeacherOpenCourseHandsOnList> getHandsOnList(GetHandsOnListParam param);
+    PageQuery<TeacherOpenCourseHandsOnList> getHandsOnList(PageQuery query);
 
     List<Map<String, Object>> 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<TeacherOpen
 
     }
 
-    public List<TeacherOpenCourseHandsOnList> getHandsOnList(GetHandsOnListParam param) {
-        List<TeacherOpenCourseHandsOnList> teacherOpenCourseHandsOnLists = teacherOpenCourseHandsOnDao.getHandsOnList(param);
+    public PageQuery<TeacherOpenCourseHandsOnList> getHandsOnList(GetHandsOnListParam param) {
+        PageQuery<TeacherOpenCourseHandsOnList> teacherOpenCourseHandsOns = teacherOpenCourseHandsOnDao.getHandsOnList(param.getPageQuery());
+        List<TeacherOpenCourseHandsOnList> teacherOpenCourseHandsOnLists = teacherOpenCourseHandsOns.getList();
         List<Long> handIds = teacherOpenCourseHandsOnLists.stream().map(v -> v.getHandsOnId()).collect(Collectors.toList());
         List<HandsOnAchievement> achievementList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(handIds)) {
@@ -212,7 +213,8 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
             teacherOpenCourseHandsOnList.setStepAvgScore(stepAvgScore);
             teacherOpenCourseHandsOnList.setReportAvgScore(reportAvgScore);
         }
-        return teacherOpenCourseHandsOnLists;
+        teacherOpenCourseHandsOns.setList(teacherOpenCourseHandsOnLists);
+        return teacherOpenCourseHandsOns;
     }
 
     public List<Map<String, Object>> getExcelValues(TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery) {
@@ -248,7 +250,8 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
     }
 
     public TeacherOpenCourseHandsOnList getHandsOnListCount(GetHandsOnListParam param) {
-        List<TeacherOpenCourseHandsOnList> teacherOpenCourseHandsOnLists = teacherOpenCourseHandsOnDao.getHandsOnList(param);
+        PageQuery<TeacherOpenCourseHandsOnList> teacherOpenCourseHandsOns = teacherOpenCourseHandsOnDao.getHandsOnList(param.getPageQuery());
+        List<TeacherOpenCourseHandsOnList> teacherOpenCourseHandsOnLists = teacherOpenCourseHandsOns.getList();
         List<Long> handIds = teacherOpenCourseHandsOnLists.stream().map(v -> v.getHandsOnId()).collect(Collectors.toList());
         List<HandsOnAchievement> 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<List<TeacherOpenCourseHandsOnList>> getHandsOnList(GetHandsOnListParam param, @SCoreUser CoreUser coreUser) {
+    public JsonResult<PageQuery<TeacherOpenCourseHandsOnList>> getHandsOnList(GetHandsOnListParam param, @SCoreUser CoreUser coreUser) {
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{
-            List<TeacherOpenCourseHandsOnList>list = teacherOpenCourseHandsOnService.getHandsOnList(param);
+            PageQuery<TeacherOpenCourseHandsOnList> list = teacherOpenCourseHandsOnService.getHandsOnList(param);
             return  JsonResult.success(list);
         }
     }