导出报错修改

镇海石化
LAPTOP-S9HJSOEB\昊天 1 year ago
parent 0b987e0f86
commit 9dbfc249dc

@ -43,6 +43,12 @@ public class StreetController {
return new Result<>(streetService.page(search)); return new Result<>(streetService.page(search));
} }
@PostMapping("/streetStockStatus")
@ApiOperation(value = "巷道列表")
//@SessionHandler
public Result<PageInfo<StreetVO>> streetStockStatus() {
return new Result<>();
}
@GetMapping("/list") @GetMapping("/list")
@ApiOperation(value = "全部巷道") @ApiOperation(value = "全部巷道")
//@SessionHandler //@SessionHandler

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

Loading…
Cancel
Save