线路时刻表分页问题

common/src/main/java/com/jpsoft/bus/modules/bus/service/RouteTimeTableService.java

@@ -14,5 +14,5 @@ public interface RouteTimeTableService {
 	int delete(String id);
 	List<RouteTimeTable> list();
     RouteTimeTable findByRouteId(String routeId);
-	Page<RouteTimeTable> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
+	Page<RouteTimeTable> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 }

common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/RouteTimeTableServiceImpl.java

@@ -63,13 +63,14 @@ public class RouteTimeTableServiceImpl implements RouteTimeTableService {
     public RouteTimeTable findByRouteId(String routeId){
         return routeTimeTableDAO.findByRouteId(routeId);
     }
-		
+
+
 	@Override
-	public Page<RouteTimeTable> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {
-        Page<RouteTimeTable> page = PageHelper.startPage(1,10).doSelectPage(()->{
-            routeTimeTableDAO.search(searchParams,sortList);
-        });
-        
-        return page;
+	public Page<RouteTimeTable> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+		Page<RouteTimeTable> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+			routeTimeTableDAO.search(searchParams,sortList);
+		});
+
+		return page;
 	}
 }

web/src/main/java/com/jpsoft/bus/modules/bus/controller/RouteTimeTableController.java

@@ -5,6 +5,7 @@ import com.jpsoft.bus.modules.common.dto.MessageResult;
 import com.jpsoft.bus.modules.common.dto.Sort;
 import com.jpsoft.bus.modules.bus.entity.RouteTimeTable;
 import com.jpsoft.bus.modules.bus.service.RouteTimeTableService;
+import com.jpsoft.bus.modules.common.utils.PojoUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -225,10 +226,10 @@ public class RouteTimeTableController {
 
         searchParams.put("routeId",routeId);
 
-        Page<RouteTimeTable> page = routeTimeTableService.pageSearch(searchParams,pageIndex,pageSize,sortList);
+        Page<RouteTimeTable> page = routeTimeTableService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
         msgResult.setResult(true);
-        msgResult.setData(page.getResult());
+        msgResult.setData(PojoUtils.pageWrapper(page));
 
         return msgResult;
     }