From 75e2cbaadea5193cd394e6df03d71a78ab936075 Mon Sep 17 00:00:00 2001 From: sungsu Date: Mon, 22 Jan 2024 10:11:07 +0900 Subject: [PATCH] =?UTF-8?q?#=EC=88=98=EC=A0=95=20stock/create.jsp=20stock/?= =?UTF-8?q?list.jsp=20stock/read.jsp=20stock/update.jsp=20WarehouseControl?= =?UTF-8?q?ler.java=20WarehouseMapper.xml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/no1/wms/stock/StockController.java | 7 +++---- src/main/java/com/no1/wms/stock/StockService.java | 6 ++---- src/main/resources/mappers/StockMapper.xml | 12 ++++++------ 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/no1/wms/stock/StockController.java b/src/main/java/com/no1/wms/stock/StockController.java index fdf0673..cdd15af 100644 --- a/src/main/java/com/no1/wms/stock/StockController.java +++ b/src/main/java/com/no1/wms/stock/StockController.java @@ -172,7 +172,7 @@ public class StockController { @PostMapping("/show_modal") public ModelAndView showModal(@RequestParam(name = "searchn", defaultValue = "0") int searchn, @RequestParam(name = "search", defaultValue = "") String search, - @RequestParam(name = "p", defaultValue = "1") int page, String product_id, + @RequestParam(name = "p", defaultValue = "1") int page, @RequestParam String name, ModelAndView mav){ int perPage = 5; // 한 페이지에 보일 글의 갯수 @@ -193,10 +193,9 @@ public class StockController { list = service.productSelect(searchn, search, startRow, perPage); count = service.productCount(searchn, search); }else if(name.equals("warehouse_capacity_currentCapacity")) { - list = service.warehousesSelect(searchn, search, startRow, perPage ,product_id); - count = service.warehouseCount(searchn, search ,product_id); + list = service.warehousesSelect(searchn, search, startRow, perPage); + count = service.warehouseCount(searchn, search); } - System.out.println("테스트 :: "+ product_id); mav.addObject("list", list); mav.addObject("start", startRow + 1); diff --git a/src/main/java/com/no1/wms/stock/StockService.java b/src/main/java/com/no1/wms/stock/StockService.java index 2dbe496..c8d349b 100644 --- a/src/main/java/com/no1/wms/stock/StockService.java +++ b/src/main/java/com/no1/wms/stock/StockService.java @@ -121,26 +121,24 @@ public class StockService { return mapper.productCount(m); } - public List> warehousesSelect(int searchn, String search, int start, int perPage, String product_id){ + public List> warehousesSelect(int searchn, String search, int start, int perPage){ Map m = new HashMap(); m.put("searchn", searchn); m.put("search", search); m.put("start", start); m.put("perPage", perPage); - m.put("product_id", product_id); List> warehouseresult = mapper.warehouseSelect(m); return warehouseresult; } - public int warehouseCount(int searchn, String search, String product_id) { + public int warehouseCount(int searchn, String search) { Map m = new HashMap(); m.put("searchn",searchn); m.put("search", search); - m.put("product_id", product_id); return mapper.warehouseCount(m); } diff --git a/src/main/resources/mappers/StockMapper.xml b/src/main/resources/mappers/StockMapper.xml index 8c05105..c60abcb 100644 --- a/src/main/resources/mappers/StockMapper.xml +++ b/src/main/resources/mappers/StockMapper.xml @@ -147,9 +147,9 @@ - (s.product_id <> #{product_id} or s.product_id is null) and w.activation = 1 and w.name like concat('%',#{search},'%') - (s.product_id <> #{product_id} or s.product_id is null) and w.activation = 1 and address like concat('%',#{search},'%') - (s.product_id <> #{product_id} or s.product_id is null) and w.activation = 1 and capacity like concat('%',#{search},'%') + w.activation = 1 and w.name like concat('%',#{search},'%') + w.activation = 1 and address like concat('%',#{search},'%') + w.activation = 1 and capacity like concat('%',#{search},'%') order by w.name desc limit #{start}, #{perPage} @@ -162,9 +162,9 @@ - (s.product_id <> #{product_id} or s.product_id is null) and w.activation = 1 and w.name like concat('%',#{search},'%') - (s.product_id <> #{product_id} or s.product_id is null) and w.activation = 1 and address like concat('%',#{search},'%') - (s.product_id <> #{product_id} or s.product_id is null) and w.activation = 1 and capacity like concat('%',#{search},'%') + w.activation = 1 and w.name like concat('%',#{search},'%') + w.activation = 1 and address like concat('%',#{search},'%') + and w.activation = 1 and capacity like concat('%',#{search},'%')