dev
This commit is contained in:
parent
ed16e4ea43
commit
d7906160d2
|
|
@ -45,10 +45,8 @@ public class StatisticsController extends BaseController {
|
||||||
public Result<Page<Goods>> numberEarlyWarning() {
|
public Result<Page<Goods>> numberEarlyWarning() {
|
||||||
Integer pageNum = parmsUtil.getInteger("pageNum", "pageNum为空");
|
Integer pageNum = parmsUtil.getInteger("pageNum", "pageNum为空");
|
||||||
Integer pageSize = parmsUtil.getInteger("pageSize", "pageSize为空");
|
Integer pageSize = parmsUtil.getInteger("pageSize", "pageSize为空");
|
||||||
QueryWrapper<Goods> goodsQuery = new QueryWrapper<>();
|
|
||||||
goodsQuery.apply("inventory_whole_number <= inventory_warn_number");
|
Page<Goods> page = goodsService.page( pageNum, pageSize);
|
||||||
goodsQuery.orderByAsc("inventory_whole_number","type");
|
|
||||||
Page<Goods> page = goodsService.page(goodsQuery, pageNum, pageSize);
|
|
||||||
return success(page);
|
return success(page);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -446,8 +446,21 @@ public class GoodsService extends BaseService {
|
||||||
public List<Goods> list(QueryWrapper<Goods> goodsQuery) {
|
public List<Goods> list(QueryWrapper<Goods> goodsQuery) {
|
||||||
return goodsMapper.selectList(goodsQuery);
|
return goodsMapper.selectList(goodsQuery);
|
||||||
}
|
}
|
||||||
public Page<Goods> page(QueryWrapper<Goods> goodsQuery,Integer pageNum,Integer pageSize) {
|
public Page<Goods> page(Integer pageNum,Integer pageSize) {
|
||||||
return pageHelper(pageNum, pageSize, goodsQuery, goodsMapper);
|
Integer offset = (pageNum - 1) * pageSize;
|
||||||
|
QueryWrapper<Goods> 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> goods = goodsMapper.selectList(goodsQuery);
|
||||||
|
Page<Goods> page = new Page<>();
|
||||||
|
page.setTotal_page(totalPage);
|
||||||
|
page.setTotal_count(totalCount);
|
||||||
|
page.setList(goods);
|
||||||
|
|
||||||
|
return page;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue