|
@@ -91,9 +91,12 @@ public class SysCuratorServiceImpl implements SysCuratorService {
|
|
|
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.setSearchCount(false);
|
|
|
- page.setTotal(curatorMapper.selectCountByLibId(libId));
|
|
|
+
|
|
|
List<Map<String, Object>> list = curatorMapper.homeworkIndex(page,params.get("libId").toString(),params.get("queryDate").toString(),params.get("searchValue").toString(), MapUtils.getString(params,"queryEndDate"));
|
|
|
data.put("list",list);
|
|
|
+ Page page2 = new Page(1,-1);
|
|
|
+ List<Map<String, Object>> list2 = curatorMapper.homeworkIndex(page2,params.get("libId").toString(),params.get("queryDate").toString(),params.get("searchValue").toString(), MapUtils.getString(params,"queryEndDate"));
|
|
|
+ page.setTotal(list2.size());
|
|
|
data.put("total",page.getTotal());
|
|
|
return data;
|
|
|
}
|
|
@@ -107,9 +110,11 @@ public class SysCuratorServiceImpl implements SysCuratorService {
|
|
|
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.setSearchCount(false);
|
|
|
List<Map<String, Object>> list = curatorMapper.searchHomeworkAllTop(page,startDate,endDate,subject);
|
|
|
data.put("list",list);
|
|
|
Page page1 = new Page(1,-1);
|
|
|
+ page1.setSearchCount(false);
|
|
|
List<Map<String, Object>> listTotal = curatorMapper.searchHomeworkAllTop(page1,startDate,endDate,subject);
|
|
|
data.put("total",listTotal.size());
|
|
|
return data;
|