From 3c855a6c858853adf3c72aaf96cc8487baf1f9da Mon Sep 17 00:00:00 2001
From: mahuandong <752432958@qq.com>
Date: Fri, 9 Aug 2019 15:33:14 +0800
Subject: [PATCH] 修改表格分页获取总记录数
---
src/main/java/com/huaheng/framework/web/controller/BaseController.java | 12 ++++++++++++
src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java | 2 +-
src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java | 2 +-
src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java | 2 +-
src/main/java/com/huaheng/pc/general/location/controller/LocationController.java | 2 +-
src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java | 2 +-
src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java | 2 +-
7 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/huaheng/framework/web/controller/BaseController.java b/src/main/java/com/huaheng/framework/web/controller/BaseController.java
index b73c2b8..c240ead 100644
--- a/src/main/java/com/huaheng/framework/web/controller/BaseController.java
+++ b/src/main/java/com/huaheng/framework/web/controller/BaseController.java
@@ -176,4 +176,16 @@ public class BaseController
{
return getUser().getLoginName();
}
+
+ /**
+ * mybatis-plus响应请求分页数据
+ */
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ protected TableDataInfo getMpDataTable(List<?> list, Long total) {
+ TableDataInfo rspData = new TableDataInfo();
+ rspData.setCode(200);
+ rspData.setData(list);
+ rspData.setTotal(total);
+ return rspData;
+ }
}
diff --git a/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java b/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java
index 0704499..0e4dea1 100644
--- a/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java
+++ b/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java
@@ -70,7 +70,7 @@ public class CompanyController extends BaseController {
*/
Page<Company> page = new Page<>(pageNum, pageSize);
IPage<Company> iPage = companyService.page(page, lambdaQueryWrapper);
- return getDataTable(iPage.getRecords());
+ return getMpDataTable(iPage.getRecords(), iPage.getTotal());
} else {
List<Company> list = companyService.list(lambdaQueryWrapper);
return getDataTable(list);
diff --git a/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java b/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java
index f3afeba..d7107e9 100644
--- a/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java
+++ b/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java
@@ -76,7 +76,7 @@ public class ContainerController extends BaseController {
/*使用分页查询*/
Page<Container> page = new Page<>(pageNum, pageSize);
IPage<Container> iPage = containerService.page(page, lambdaQueryWrapper);
- return getDataTable(iPage.getRecords());
+ return getMpDataTable(iPage.getRecords(), iPage.getTotal());
} else {
List<Container> list = containerService.list(lambdaQueryWrapper);
return getDataTable(list);
diff --git a/src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java b/src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java
index 893c3fa..9f6153f 100644
--- a/src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java
+++ b/src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java
@@ -75,7 +75,7 @@ public class CustomerController extends BaseController {
/*使用分页查询*/
Page<Customer> page = new Page<>(pageNum, pageSize);
IPage<Customer> iPage = customerService.page(page, lambdaQueryWrapper);
- return getDataTable(iPage.getRecords());
+ return getMpDataTable(iPage.getRecords(), iPage.getTotal());
} else {
List<Customer> list = customerService.list(lambdaQueryWrapper);
return getDataTable(list);
diff --git a/src/main/java/com/huaheng/pc/general/location/controller/LocationController.java b/src/main/java/com/huaheng/pc/general/location/controller/LocationController.java
index 696a518..3b4ad19 100644
--- a/src/main/java/com/huaheng/pc/general/location/controller/LocationController.java
+++ b/src/main/java/com/huaheng/pc/general/location/controller/LocationController.java
@@ -80,7 +80,7 @@ public class LocationController extends BaseController {
/*使用分页查询*/
Page<Location> page = new Page<>(pageNum, pageSize);
IPage<Location> iPage = locationService.page(page, lambdaQueryWrapper);
- return getDataTable(iPage.getRecords());
+ return getMpDataTable(iPage.getRecords(), iPage.getTotal());
} else {
List<Location> list = locationService.list(lambdaQueryWrapper);
return getDataTable(list);
diff --git a/src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java b/src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java
index c5c24b7..1be9863 100644
--- a/src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java
+++ b/src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java
@@ -75,7 +75,7 @@ public class SupplierController extends BaseController {
/*使用分页查询*/
Page<Supplier> page = new Page<>(pageNum, pageSize);
IPage<Supplier> iPage = supplierService.page(page, lambdaQueryWrapper);
- return getDataTable(iPage.getRecords());
+ return getMpDataTable(iPage.getRecords(), iPage.getTotal());
} else {
List<Supplier> list = supplierService.list(lambdaQueryWrapper);
return getDataTable(list);
diff --git a/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java b/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java
index 823473e..0583595 100644
--- a/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java
+++ b/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java
@@ -76,7 +76,7 @@ public class WareHouseController extends BaseController {
if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
Page<Warehouse> page = new Page<>(pageNum, pageSize);
IPage<Warehouse> iPage = warehouseService.page(page, lambdaQueryWrapper);
- return getDataTable(iPage.getRecords());
+ return getMpDataTable(iPage.getRecords(), iPage.getTotal());
} else {
List<Warehouse> list = warehouseService.list(lambdaQueryWrapper);
return getDataTable(list);
--
libgit2 0.22.2