|
@@ -1,5 +1,6 @@
|
|
|
package com.ssj.service.sys.fx.service.impl;
|
|
|
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.ssj.bean.conch.curator.dto.CuratorTeacherListDto;
|
|
|
import com.ssj.framework.core.util.Constant;
|
|
|
import com.ssj.framework.weixin.util.Collections3;
|
|
@@ -106,7 +107,9 @@ public class SysCuratorServiceImpl implements SysCuratorService {
|
|
|
com.baomidou.mybatisplus.extension.plugins.pagination.Page page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page(pageNo, pageSize);
|
|
|
List<Map<String, Object>> list = curatorMapper.searchHomeworkAllTop(page,startDate,endDate,subject);
|
|
|
data.put("list",list);
|
|
|
- data.put("total",page.getTotal());
|
|
|
+ Page page1 = new Page(1,-1);
|
|
|
+ List<Map<String, Object>> listTotal = curatorMapper.searchHomeworkAllTop(page1,startDate,endDate,subject);
|
|
|
+ data.put("total",listTotal.size());
|
|
|
return data;
|
|
|
}
|
|
|
|
|
@@ -116,7 +119,9 @@ public class SysCuratorServiceImpl implements SysCuratorService {
|
|
|
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);
|
|
|
- data.put("total",page.getTotal());
|
|
|
+ Page page1 = new Page(1,-1);
|
|
|
+ List<Map<String, Object>> list2 = curatorMapper.searchActiveTop(page1,startDate,endDate);
|
|
|
+ data.put("total",list2.size());
|
|
|
return data;
|
|
|
}
|
|
|
|