活跃度显示分页问题修复

src/main/java/com/ssj/service/mapper/CuratorMapper.java

@@ -180,6 +180,6 @@ public interface CuratorMapper {
 
     List<Map<String, Object>> searchHomeworkAllTop(Page page,@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("subject")String subject);
 
-    List<Map<String, Object>> searchActiveTop(Page page,@Param("startDate")String startDate, @Param("endDate")String endDate);
+    List<Map<String, Object>> searchActiveTop(@Param("startDate")String startDate, @Param("endDate")String endDate);
 }
 

src/main/java/com/ssj/service/sys/fx/service/impl/SysCuratorServiceImpl.java

@@ -117,11 +117,15 @@ public class SysCuratorServiceImpl implements SysCuratorService {
     public Map<String, Object> searchActiveTop(String startDate, String endDate, int pageNo, int pageSize) {
         Map<String, Object> data = new HashMap<>(2);
         com.baomidou.mybatisplus.extension.plugins.pagination.Page   page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page(pageNo, pageSize);
-        List<Map<String, Object>> list = curatorMapper.searchActiveTop(page,startDate,endDate);
-        data.put("list",list);
-        Page page1 = new Page(1,-1);
-        List<Map<String, Object>> list2 = curatorMapper.searchActiveTop(page1,startDate,endDate);
-        data.put("total",list2.size());
+        List<Map<String, Object>> list = curatorMapper.searchActiveTop(startDate,endDate);
+        data.put("total",list.size());
+        List<Map<String, Object>> lastList = new ArrayList<>();
+        if(pageNo >0){
+            lastList =list.subList((pageNo-1)*pageSize,pageNo*pageSize);
+        }else{
+            lastList.addAll(list);
+        }
+        data.put("list",lastList);
         return data;
     }
 

src/main/java/com/ssj/sys/controller/SysCuratorController.java

@@ -201,10 +201,10 @@ public class SysCuratorController extends BaseController {
             response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头
             response.setContentType("application/vnd.ms-excel;charset=UTF-8");
             response.setCharacterEncoding("utf-8");
-            Map<String, Object> params = new HashMap<String, Object>();
 
-            int pageSize = 10000;
-            int pageNo =  1;
+
+            int pageSize = 10;
+            int pageNo =  -1;
             Map<String, Object> data=sysCuratorService.searchActiveTop(startDate,endDate,pageNo,pageSize);
             List<Map<String, Object>> studentList = (List<Map<String, Object>>)data.get("list");
             //学生数据

src/main/resources/mybatis/mapper/CuratorMapper.xml

@@ -602,6 +602,6 @@
             </if>
             group  by t1.lib_id
         )a GROUP BY a.lib_id
-        order by percent desc
+        order by percent desc,a.lib_id
     </select>
 </mapper>