diff --git a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java b/web/src/main/java/com/zhehekeji/web/controller/StreetController.java index 71d4194..5ced4c4 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StreetController.java @@ -43,6 +43,12 @@ public class StreetController { return new Result<>(streetService.page(search)); } + @PostMapping("/streetStockStatus") + @ApiOperation(value = "巷道列表") + //@SessionHandler + public Result> streetStockStatus() { + return new Result<>(); + } @GetMapping("/list") @ApiOperation(value = "全部巷道") //@SessionHandler diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/zhehekeji/web/service/StockService.java index d83d9cf..7e8a1ea 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -73,13 +73,13 @@ public class StockService { return new ArrayList<>(); } //List shelves = streetService.check(street); - List stocks = stockMapper.selectList(new QueryWrapper().eq("street_id",streetId).orderByAsc("shelve_id", "`row`", "`column`")); + List stocks = stockMapper.selectList(new QueryWrapper().eq("street_id",streetId).orderByAsc("street_id", "`row`", "`column`")); return stocks; } public PageInfo page(PageSearch pageSearch) { PageHelper.startPage(pageSearch.getPageNum(), pageSearch.getPageSize()); - List stocks = stockMapper.selectList(new QueryWrapper().orderByAsc("shelve_id", "`row`", "`column`")); + List stocks = stockMapper.selectList(new QueryWrapper().orderByAsc("street_id", "`row`", "`column`")); return new PageInfo<>(stocks); }