wms / wms_xiaogangabu · Commits

Commit 3c855a6c858853adf3c72aaf96cc8487baf1f9da

Authored by mahuandong
1 parent 93f50a08

修改表格分页获取总记录数

Inline Side-by-side
Showing 7 changed files with 18 additions and 6 deletions
src/main/java/com/huaheng/framework/web/controller/BaseController.java
  View file @3c855a6
... ... @@ -176,4 +176,16 @@ public class BaseController
176 176 {
177 177 return getUser().getLoginName();
178 178 }
  179 +
  180 + /**
  181 + * mybatis-plus响应请求分页数据
  182 + */
  183 + @SuppressWarnings({ "rawtypes", "unchecked" })
  184 + protected TableDataInfo getMpDataTable(List<?> list, Long total) {
  185 + TableDataInfo rspData = new TableDataInfo();
  186 + rspData.setCode(200);
  187 + rspData.setData(list);
  188 + rspData.setTotal(total);
  189 + return rspData;
  190 + }
179 191 }
... ...
src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java
  View file @3c855a6
... ... @@ -70,7 +70,7 @@ public class CompanyController extends BaseController {
70 70 */
71 71 Page<Company> page = new Page<>(pageNum, pageSize);
72 72 IPage<Company> iPage = companyService.page(page, lambdaQueryWrapper);
73   - return getDataTable(iPage.getRecords());
  73 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
74 74 } else {
75 75 List<Company> list = companyService.list(lambdaQueryWrapper);
76 76 return getDataTable(list);
... ...
src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java
  View file @3c855a6
... ... @@ -76,7 +76,7 @@ public class ContainerController extends BaseController {
76 76 /*使用分页查询*/
77 77 Page<Container> page = new Page<>(pageNum, pageSize);
78 78 IPage<Container> iPage = containerService.page(page, lambdaQueryWrapper);
79   - return getDataTable(iPage.getRecords());
  79 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
80 80 } else {
81 81 List<Container> list = containerService.list(lambdaQueryWrapper);
82 82 return getDataTable(list);
... ...
src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java
  View file @3c855a6
... ... @@ -75,7 +75,7 @@ public class CustomerController extends BaseController {
75 75 /*使用分页查询*/
76 76 Page<Customer> page = new Page<>(pageNum, pageSize);
77 77 IPage<Customer> iPage = customerService.page(page, lambdaQueryWrapper);
78   - return getDataTable(iPage.getRecords());
  78 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
79 79 } else {
80 80 List<Customer> list = customerService.list(lambdaQueryWrapper);
81 81 return getDataTable(list);
... ...
src/main/java/com/huaheng/pc/general/location/controller/LocationController.java
  View file @3c855a6
... ... @@ -80,7 +80,7 @@ public class LocationController extends BaseController {
80 80 /*使用分页查询*/
81 81 Page<Location> page = new Page<>(pageNum, pageSize);
82 82 IPage<Location> iPage = locationService.page(page, lambdaQueryWrapper);
83   - return getDataTable(iPage.getRecords());
  83 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
84 84 } else {
85 85 List<Location> list = locationService.list(lambdaQueryWrapper);
86 86 return getDataTable(list);
... ...
src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java
  View file @3c855a6
... ... @@ -75,7 +75,7 @@ public class SupplierController extends BaseController {
75 75 /*使用分页查询*/
76 76 Page<Supplier> page = new Page<>(pageNum, pageSize);
77 77 IPage<Supplier> iPage = supplierService.page(page, lambdaQueryWrapper);
78   - return getDataTable(iPage.getRecords());
  78 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
79 79 } else {
80 80 List<Supplier> list = supplierService.list(lambdaQueryWrapper);
81 81 return getDataTable(list);
... ...
src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java
  View file @3c855a6
... ... @@ -76,7 +76,7 @@ public class WareHouseController extends BaseController {
76 76 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
77 77 Page<Warehouse> page = new Page<>(pageNum, pageSize);
78 78 IPage<Warehouse> iPage = warehouseService.page(page, lambdaQueryWrapper);
79   - return getDataTable(iPage.getRecords());
  79 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
80 80 } else {
81 81 List<Warehouse> list = warehouseService.list(lambdaQueryWrapper);
82 82 return getDataTable(list);
... ...