From 9dbfc249dc93b7051811e8c2ea893384baaa8b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Fri, 27 Dec 2024 14:19:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zhehekeji/web/controller/StreetController.java | 6 ++++++
 .../main/java/com/zhehekeji/web/service/StockService.java   | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

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<PageInfo<StreetVO>> 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<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;
     }
 
     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("street_id", "`row`", "`column`"));
         return new PageInfo<>(stocks);
 
     }