xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-11-22 18:36:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修改单词错误;修改Date为LocalDateTime;修改PageUtil工具类;添加.gitignore;

Browse Source
This commit is contained in:
Turbolisten
2020-09-07 18:30:26 +08:00
parent 486cc02088
commit 3e95e29b15
17 changed files with 79 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartPageUtil.java
View File

@@ -22,7 +22,7 @@ public class SmartPageUtil {
PageResultDTO<T> result = new PageResultDTO<>();
result.setPageNum(page.getCurrent());
result.setPageSize(page.getSize());
result.setTotal(Long.valueOf(page.getTotal()));
result.setTotal(page.getTotal());
result.setPages(page.getPages());
result.setList(page.getRecords());
return result;
@@ -33,7 +33,7 @@ public class SmartPageUtil {
List<OrderItemDTO> orders = baseDTO.getOrders();
if (orders != null && !orders.isEmpty()) {
List<com.baomidou.mybatisplus.core.metadata.OrderItem> orderItemList = orders.stream().map(e -> convertOrderItem(e)).collect(Collectors.toList());
List<com.baomidou.mybatisplus.core.metadata.OrderItem> orderItemList = orders.stream().map(SmartPageUtil::convertOrderItem).collect(Collectors.toList());
page.setOrders(orderItemList);
}
page.setCurrent(baseDTO.getPageNum());
@@ -90,7 +90,7 @@ public class SmartPageUtil {
PageResultDTO pageResultDTO = new PageResultDTO();
pageResultDTO.setPageNum(page.getCurrent());
pageResultDTO.setPageSize(page.getSize());
pageResultDTO.setTotal(Long.valueOf(page.getTotal()));
pageResultDTO.setTotal(page.getTotal());
pageResultDTO.setPages(page.getPages());
return pageResultDTO;
}