|
@ -72,6 +72,20 @@ public class TestReportController { |
|
|
Page page = new Page(); |
|
|
Page page = new Page(); |
|
|
page.setSize(pageQuery.getPageSize()); |
|
|
page.setSize(pageQuery.getPageSize()); |
|
|
page.setCurrent(pageQuery.getPageNum()); |
|
|
page.setCurrent(pageQuery.getPageNum()); |
|
|
|
|
|
if(StrUtil.isNotEmpty(pageQuery.getOrderByColumn())){ |
|
|
|
|
|
if(StrUtil.isNotEmpty(pageQuery.getIsAsc())){ |
|
|
|
|
|
if(pageQuery.getIsAsc().equals("asc")){ |
|
|
|
|
|
query.orderByAsc(pageQuery.getOrderByColumn()); |
|
|
|
|
|
}else if(pageQuery.getIsAsc().equals("desc")){ |
|
|
|
|
|
query.orderByDesc(pageQuery.getOrderByColumn()); |
|
|
|
|
|
}else { |
|
|
|
|
|
query.orderByDesc(pageQuery.getOrderByColumn()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
Page result = testReportService.page(page, query); |
|
|
Page result = testReportService.page(page, query); |
|
|
TableDataInfo dataInfo = new TableDataInfo(); |
|
|
TableDataInfo dataInfo = new TableDataInfo(); |
|
|
dataInfo.setTotal(result.getTotal()); |
|
|
dataInfo.setTotal(result.getTotal()); |
|
|