|
|
|
|
@ -73,13 +73,13 @@ public class StockService {
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
}
|
|
|
|
|
//List<String> shelves = streetService.check(street);
|
|
|
|
|
List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().eq("street_id",streetId).orderByAsc("shelve_id", "`row`", "`column`"));
|
|
|
|
|
List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().eq("street_id",streetId).orderByAsc("`row`", "`column`"));
|
|
|
|
|
return stocks;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public PageInfo<Stock> page(PageSearch pageSearch) {
|
|
|
|
|
PageHelper.startPage(pageSearch.getPageNum(), pageSearch.getPageSize());
|
|
|
|
|
List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().orderByAsc("shelve_id", "`row`", "`column`"));
|
|
|
|
|
List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().orderByAsc( "`row`", "`column`"));
|
|
|
|
|
return new PageInfo<>(stocks);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|