Explorar o código

活跃度排行分页异常问题修复

shenhao %!s(int64=4) %!d(string=hai) anos
pai
achega
b3c5c33815

+ 1 - 1
src/main/java/com/ssj/service/mapper/CuratorMapper.java

@@ -180,7 +180,7 @@ 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(@Param("startDate")String startDate, @Param("endDate")String endDate);
+    List<Map<String, Object>> searchActiveTop(Page page,@Param("startDate")String startDate, @Param("endDate")String endDate);
 
     long selectCountByLibId(@Param("libId") String libId);
 }

+ 9 - 11
src/main/java/com/ssj/service/sys/fx/service/impl/SysCuratorServiceImpl.java

@@ -109,7 +109,7 @@ public class SysCuratorServiceImpl implements SysCuratorService {
     @Override
     public Map<String, Object> searchTop(String startDate, String endDate, int pageNo, int pageSize, String subject) {
         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);
+        Page   page = new Page(pageNo, pageSize);
         page.setSearchCount(false);
         List<Map<String, Object>> list = curatorMapper.searchHomeworkAllTop(page,startDate,endDate,subject);
         data.put("list",list);
@@ -123,16 +123,14 @@ public class SysCuratorServiceImpl implements SysCuratorService {
     @Override
     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(startDate,endDate);
-        data.put("total",list.size());
-        List<Map<String, Object>> lastList = new ArrayList<>();
-        if(pageNo >1){
-            lastList =list.subList((pageNo-1)*pageSize,pageNo*pageSize);
-        }else{
-            lastList.addAll(list);
-        }
-        data.put("list",lastList);
+        Page   page = new Page(pageNo, pageSize);
+        page.setSearchCount(false);
+        List<Map<String, Object>> list = curatorMapper.searchActiveTop(page,startDate,endDate);
+        Page page1 = new Page(1,-1);
+        page1.setSearchCount(false);
+        List<Map<String, Object>> lastList =  curatorMapper.searchActiveTop(page1,startDate,endDate);
+        data.put("total",lastList.size());
+        data.put("list",list);
         return data;
     }
 

+ 1 - 1
src/main/resources/mybatis/mapper/CuratorMapper.xml

@@ -597,7 +597,7 @@
             from scon_homework t
             left join tb_lib_vip t1 on t.vip_id = t1.id
             join tb_lib_join t2 on t1.lib_id = t2.id
-            where  t1.lib_id is not null
+            where  1=1
             <if test="startDate != null and startDate != '' ">
                 and t.create_time >= #{startDate}
             </if>