From e2566724862cf1ef1b1794d9a6c0a8c131eb78a3 Mon Sep 17 00:00:00 2001 From: Suh Date: Fri, 5 Jan 2024 21:23:18 +0900 Subject: [PATCH] =?UTF-8?q?stock=20=EC=AA=BD=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/no1/wms/stock/StockMapper.java | 2 +- .../java/com/no1/wms/stock/StockService.java | 7 ++++--- src/main/resources/mappers/StockMapper.xml | 16 ++++++++-------- src/main/resources/static/css/base.css | 4 ++++ src/main/resources/static/dev/base.css | 4 ++++ src/main/resources/static/dev/layout_dev.html | 4 ++-- 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/no1/wms/stock/StockMapper.java b/src/main/java/com/no1/wms/stock/StockMapper.java index a64b7eb..941f295 100644 --- a/src/main/java/com/no1/wms/stock/StockMapper.java +++ b/src/main/java/com/no1/wms/stock/StockMapper.java @@ -11,7 +11,7 @@ public interface StockMapper { int count(Map m);//검색 글 갯수 - List stockList(Map m); + List list(Map m); int updateStock(StockDto dto); diff --git a/src/main/java/com/no1/wms/stock/StockService.java b/src/main/java/com/no1/wms/stock/StockService.java index aa7e81b..ac7664c 100644 --- a/src/main/java/com/no1/wms/stock/StockService.java +++ b/src/main/java/com/no1/wms/stock/StockService.java @@ -19,6 +19,8 @@ public class StockService { Map m = new HashMap(); m.put("searchn",searchn); m.put("search", search); + m.put("start", 0); + m.put("perPage", 10000); return mapper.count(m); } @@ -31,9 +33,8 @@ public class StockService { m.put("searchn",searchn); m.put("search", search); m.put("start", start); - m.put("count", 10); - - return mapper.stockList(m); + m.put("perPage", 10); + return mapper.list(m); } diff --git a/src/main/resources/mappers/StockMapper.xml b/src/main/resources/mappers/StockMapper.xml index 3645a61..faa5f98 100644 --- a/src/main/resources/mappers/StockMapper.xml +++ b/src/main/resources/mappers/StockMapper.xml @@ -2,18 +2,18 @@ - + - + select count(*) from stock left join warehouse on stock.warehouse_id = warehouse.id left join product on stock.product_id = product.id - wms.stock.activation = 1 and wms.warehouse.name like concat('%',#{search},'%') - wms.stock.activation = 1 and wms.product.name like concat('%',#{search},'%') + stock.activation = 1 and warehouse.name like concat('%',#{search},'%') + stock.activation = 1 and product.name like concat('%',#{search},'%') - order by id desc limit #{start}, #{perPage} + order by stock.id desc limit #{start}, #{perPage}