diff --git a/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java b/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java index 8f11ea8..c86bcaf 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java @@ -45,10 +45,8 @@ public class StatisticsController extends BaseController { public Result> numberEarlyWarning() { Integer pageNum = parmsUtil.getInteger("pageNum", "pageNum为空"); Integer pageSize = parmsUtil.getInteger("pageSize", "pageSize为空"); - QueryWrapper goodsQuery = new QueryWrapper<>(); - goodsQuery.apply("inventory_whole_number <= inventory_warn_number"); - goodsQuery.orderByAsc("inventory_whole_number","type"); - Page page = goodsService.page(goodsQuery, pageNum, pageSize); + + Page page = goodsService.page( pageNum, pageSize); return success(page); } diff --git a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java index d52f21c..a563b34 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java @@ -446,8 +446,21 @@ public class GoodsService extends BaseService { public List list(QueryWrapper goodsQuery) { return goodsMapper.selectList(goodsQuery); } - public Page page(QueryWrapper goodsQuery,Integer pageNum,Integer pageSize) { - return pageHelper(pageNum, pageSize, goodsQuery, goodsMapper); + public Page page(Integer pageNum,Integer pageSize) { + Integer offset = (pageNum - 1) * pageSize; + QueryWrapper goodsQuery = new QueryWrapper<>(); + goodsQuery.apply("inventory_whole_number <= inventory_warn_number"); + Long totalCount = goodsMapper.selectCount(goodsQuery); + int totalPage= (int) (totalCount % pageSize == 0 ? totalCount / pageSize : totalCount / pageSize + 1); + goodsQuery.orderByAsc("inventory_whole_number","type"); + goodsQuery.last("limit " + pageSize + " offset " + offset); + List goods = goodsMapper.selectList(goodsQuery); + Page page = new Page<>(); + page.setTotal_page(totalPage); + page.setTotal_count(totalCount); + page.setList(goods); + + return page; }