|
@@ -109,7 +109,7 @@ public class SysCuratorServiceImpl implements SysCuratorService {
|
|
@Override
|
|
@Override
|
|
public Map<String, Object> searchTop(String startDate, String endDate, int pageNo, int pageSize, String subject) {
|
|
public Map<String, Object> searchTop(String startDate, String endDate, int pageNo, int pageSize, String subject) {
|
|
Map<String, Object> data = new HashMap<>(2);
|
|
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);
|
|
page.setSearchCount(false);
|
|
List<Map<String, Object>> list = curatorMapper.searchHomeworkAllTop(page,startDate,endDate,subject);
|
|
List<Map<String, Object>> list = curatorMapper.searchHomeworkAllTop(page,startDate,endDate,subject);
|
|
data.put("list",list);
|
|
data.put("list",list);
|
|
@@ -123,16 +123,14 @@ public class SysCuratorServiceImpl implements SysCuratorService {
|
|
@Override
|
|
@Override
|
|
public Map<String, Object> searchActiveTop(String startDate, String endDate, int pageNo, int pageSize) {
|
|
public Map<String, Object> searchActiveTop(String startDate, String endDate, int pageNo, int pageSize) {
|
|
Map<String, Object> data = new HashMap<>(2);
|
|
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;
|
|
return data;
|
|
}
|
|
}
|
|
|
|
|