diff --git a/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java b/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java index 307dd5a..7737b33 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java +++ b/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java @@ -208,10 +208,24 @@ public class ShopOrderController extends AbstractController { public Object searchProductionDispatchList(@RequestBody SearchProductionDispatchListData indata) { Map map = new HashMap<>(); try { + // 计算OFFSET值(页码从1开始,OFFSET从0开始) + if (indata.getPage() != null && indata.getLimit() != null) { + indata.setPage((indata.getPage() - 1) * indata.getLimit()); + } + List result = shopOrderService.searchProductionDispatchList(indata); + + // 获取总记录数(从第一条记录中获取) + int total = 0; + if (result != null && !result.isEmpty() && result.get(0).getTotalCount() != null) { + total = result.get(0).getTotalCount(); + } else if (result != null) { + total = result.size(); + } + map.put("success", true); map.put("rows", result); - map.put("total", result.size()); + map.put("total", total); } catch (Exception e) { map.put("success", false); map.put("msg", e.getMessage()); diff --git a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchProductionDispatchListData.java b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchProductionDispatchListData.java index b730246..26437e1 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchProductionDispatchListData.java +++ b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchProductionDispatchListData.java @@ -84,6 +84,9 @@ public class SearchProductionDispatchListData { private boolean checked; private String sql; private Integer serialNumber; + private Integer page; // 当前页码 + private Integer limit; // 每页数量 + private Integer totalCount; // 总记录数 public Integer getSerialNumber() { return serialNumber; @@ -93,6 +96,30 @@ public class SearchProductionDispatchListData { this.serialNumber = serialNumber; } + public Integer getPage() { + return page; + } + + public void setPage(Integer page) { + this.page = page; + } + + public Integer getLimit() { + return limit; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public Integer getTotalCount() { + return totalCount; + } + + public void setTotalCount(Integer totalCount) { + this.totalCount = totalCount; + } + public String getSite() { return site; } diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml index fc02969..1bcb955 100644 --- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml +++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml @@ -97,6 +97,9 @@