|
@@ -61,7 +61,7 @@ public class ReportManageController {
|
|
|
@RequestParam(defaultValue = "")String recommenderName,
|
|
|
@RequestParam(defaultValue = "")String cityName,
|
|
|
@RequestParam(defaultValue = "1")Integer pageNum,
|
|
|
- @RequestParam(defaultValue = "10")Integer pageSize){
|
|
|
+ @RequestParam(defaultValue = "")Integer pageSize){
|
|
|
ModelAndView mav = new ModelAndView();
|
|
|
List<Recommender> recommendersList = iRecommenderService.listAllRecommender();//查询推荐人信息
|
|
|
mav.addObject("recommendersList",recommendersList);
|
|
@@ -98,7 +98,7 @@ public class ReportManageController {
|
|
|
int proNum=0;//服务商数量
|
|
|
int supNum=0;//经销商数量
|
|
|
int allNum=0;//总和数量
|
|
|
- List<RecommenderReport> listRecommenderReportInfo = iProviderService.listRecommenderReportInfo(sDateVal,eDateVal,monthVal,refferPhone,cityName,pageNum,pageSize);
|
|
|
+ List<RecommenderReport> listRecommenderReportInfo = iProviderService.listRecommenderReportInfo(sDateVal,eDateVal,monthVal,refferPhone,cityName,pageNum,Integer.MAX_VALUE);
|
|
|
|
|
|
if (listRecommenderReportInfo != null && listRecommenderReportInfo.size()!= 0) {
|
|
|
for (RecommenderReport r : listRecommenderReportInfo) {
|
|
@@ -111,7 +111,8 @@ public class ReportManageController {
|
|
|
recommenderReport.setProviderNumber(proNum);
|
|
|
recommenderReport.setSupplierNumber(supNum);
|
|
|
recommenderReport.setSumNumber(allNum);
|
|
|
- listRecommenderReportInfo.add(listRecommenderReportInfo.size(),recommenderReport);
|
|
|
+ /*listRecommenderReportInfo.add(listRecommenderReportInfo.size(),recommenderReport);*/
|
|
|
+ listRecommenderReportInfo.add(0,recommenderReport);
|
|
|
}
|
|
|
|
|
|
mav.addObject("pageInfo",new PageInfo<RecommenderReport>(listRecommenderReportInfo));
|