github-mirrors/No1WMS
1
0
Fork 0
mirror of https://github.com/suhf/No1WMS.git synced 2026-02-05 04:03:45 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Suh
2024-01-11 16:33:24 +09:00
parent 76e6d3c949 706dade420
commit 9249fb4b50
6 changed files with 338 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/main/java/com/no1/wms/category/CategoryController.java
View File

@@ -40,11 +40,41 @@ public class CategoryController {
// 카테고리 리스트 출력
@GetMapping("/category/list")
public String list(@RequestParam(name = "p", defaultValue = "1") int p, Model m) {
public String list(@RequestParam(name = "searchn", defaultValue = "4") int searchn,
@RequestParam(name = "search", defaultValue = "") String search,
@RequestParam(name = "p", defaultValue = "1") int page, Model m) {
// 서비스로 카테고리 목록 불러오는 메서드 작성
List<CategoryDto> dto = categoryService.categoryList(p);
int count = categoryService.count(searchn, search);
int perPage = 15; // 한 페이지에 보일 글의 개수
int startRow = (page - 1) * perPage;
List<CategoryDto> dto = categoryService.categoryList2(searchn, search, startRow ,perPage);
m.addAttribute("list", dto);
m.addAttribute("start", startRow + 1);
int pageNum = 5;//보여질 페이지 번호 수
int totalPages = count / perPage + (count % perPage > 0 ? 1 : 0); // 전체 페이지 수
int begin = (page - 1) / pageNum * pageNum + 1;
int end = begin + pageNum - 1;
if (end > totalPages) {
end = totalPages;
}
m.addAttribute("searchn",searchn);
m.addAttribute("search",search);
m.addAttribute("begin", begin);
m.addAttribute("end", end);
m.addAttribute("pageNum", pageNum);
m.addAttribute("totalPages", totalPages);
m.addAttribute("p" , page);
// 서비스로 카테고리 목록 불러오는 메서드 작성
//List<CategoryDto> dto = categoryService.categoryList(page);
//m.addAttribute("list", dto);
return "category/list";
}
@@ -128,6 +158,36 @@ public class CategoryController {
return checkkan;
}
@PostMapping("/category/categorysearch")
public String categorySearch(@RequestParam(name = "searchn", defaultValue = "4") int searchn,
@RequestParam(name = "search", defaultValue = "") String search,
@RequestParam(name = "p", defaultValue = "1") int page, Model m) {
int count = categoryService.count(searchn, search);
int perPage = 10; // 한 페이지에 보일 글의 개수
int startRow = (page - 1) * perPage;
List<CategoryDto> dto = categoryService.categoryList2(searchn, search, startRow ,perPage);
m.addAttribute("list", dto);
m.addAttribute("start", startRow + 1);
int pageNum = 5;//보여질 페이지 번호 수
int totalPages = count / perPage + (count % perPage > 0 ? 1 : 0); // 전체 페이지 수
int begin = (page - 1) / pageNum * pageNum + 1;
int end = begin + pageNum - 1;
if (end > totalPages) {
end = totalPages;
}
m.addAttribute("begin", begin);
m.addAttribute("end", end);
m.addAttribute("pageNum", pageNum);
m.addAttribute("totalPages", totalPages);
m.addAttribute("p" , page);
return "modal/categorysearch";
}
}

7
src/main/java/com/no1/wms/category/CategoryMapper.java
View File

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CategoryMapper {
List<CategoryDto> categoryList(Map<String, Object> m);
List<CategoryDto> categoryList(Map<String, Object> m);//검색기능 미포함
CategoryDto selectByKanCode(String kan_code);
int createProcess(CategoryDto dto);
List<CategoryDto> selectAllCategory();
@@ -15,4 +15,9 @@ public interface CategoryMapper {
int deactivateByKanCode(String kan_code);
int activateByKanCode(String kan_code);
String kanCheck(String kan_code);
int count(Map<String, Object> m);//카운터
List<CategoryDto> categoryList2(Map<String, Object> m);//검색기능까지 포함
}

22
src/main/java/com/no1/wms/category/CategoryService.java
View File

@@ -56,5 +56,27 @@ public class CategoryService {
return mapper.kanCheck(kan_code);
}
public int count(int searchn, String search) {
Map<String,Object> m = new HashMap<String, Object>();
m.put("searchn",searchn);
m.put("search", search);
return mapper.count(m);
}
public List<CategoryDto> categoryList2(int searchn, String search, int start, int perPage){
Map<String, Object> m = new HashMap<String, Object>();
m.put("searchn",searchn);
m.put("search", search);
m.put("start", start);
m.put("perPage", perPage);
return mapper.categoryList2(m);
}
}