From ab5bf80c8e1a871545113f0fbc194dd13178fa5d Mon Sep 17 00:00:00 2001 From: jazz Date: Tue, 25 Nov 2025 18:20:50 +0900 Subject: [PATCH] =?UTF-8?q?fo=20bo=20=EB=A8=B8=EC=A7=80=EC=9E=91=EC=97=85?= =?UTF-8?q?=20-=20=EC=98=A4=EB=A5=98=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MaMbrgradController.java | 31 ++++++++++++------- .../admin/store/mbrgrad/vo/BOMaMbrgradVO.java | 1 + .../admin/store/sopmal/vo/BOMaSopmalVO.java | 1 + 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/controller/MaMbrgradController.java b/src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/controller/MaMbrgradController.java index 217a1892..f81ce2c7 100644 --- a/src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/controller/MaMbrgradController.java +++ b/src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/controller/MaMbrgradController.java @@ -195,28 +195,37 @@ public class MaMbrgradController { vo.setPageIndex(1); vo.setPageUnit(10000); - /*쇼핑몰 조회*/ - List sopmalList = new ArrayList<>(); - sopmalList = sopmalService.selectBOSopmalCdNm(); + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(vo.getPageIndex()); + paginationInfo.setRecordCountPerPage(vo.getPageUnit()); + paginationInfo.setPageSize(paginationProperties.getPageSize()); - DataMap resultMap = new DataMap(); + vo.setPaginationInfo(paginationInfo); + vo.setFirstIndex(paginationInfo.getFirstRecordIndex()); + vo.setLastIndex(paginationInfo.getLastRecordIndex()); + vo.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + + List mbrgradList = new ArrayList<>(); + mbrgradList = service.selectBOMbrGradList(vo); + + Map resultMap = new HashMap(); resultMap.put("paramVO", vo); - resultMap.put("sopmalList", sopmalList); + resultMap.put("resultList", mbrgradList); + resultMap.put("paginationInfo", vo.getPaginationInfo()); // Map resultMap = responseHandler.handleResponseAsMap( // sendToResrc.ofPost(RESRC.GCONEBO, "/admin/store/mbrgrad/selectBOMbrGradListInqire", vo) // ); /*엑셀 데이터 set*/ - List> excelList = new ArrayList<>(); - excelList = (List>) resultMap.get("resultList"); + List excelList = new ArrayList<>(); + excelList = (List) resultMap.get("resultList"); //엑셀 다운로드 다운로드 시간 Date date = new Date(); SimpleDateFormat excelFormat = new SimpleDateFormat("yyyyMMddHHmmss"); String str = excelFormat.format(date); - try { //엑셀 항목에 출력될 내용 설정 List> dataList = new ArrayList<>(); @@ -224,8 +233,8 @@ public class MaMbrgradController { BigInteger num = BigInteger.valueOf(excelList.size()); for (int i = 0; i < excelList.size(); i++) { HashMap dataMap = new HashMap<>(); - HashMap map = new HashMap<>(); - map = (HashMap) excelList.get(i); + DataMap map = new DataMap(); + map = excelList.get(i); /*데이터 set*/ dataMap.put("itme01", num.subtract(BigInteger.valueOf(i))); @@ -258,6 +267,4 @@ public class MaMbrgradController { throw new WnbtRestException("엑셀다운로드 중 오류가 발생하였습니다."); } } - - } \ No newline at end of file diff --git a/src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/vo/BOMaMbrgradVO.java b/src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/vo/BOMaMbrgradVO.java index c80d035f..05556eb5 100644 --- a/src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/vo/BOMaMbrgradVO.java +++ b/src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/vo/BOMaMbrgradVO.java @@ -96,4 +96,5 @@ public class BOMaMbrgradVO extends AbstractVO { private String gradAuthorInnb; /*서버구분*/ private String serverDv; + private String pageDv; } diff --git a/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/vo/BOMaSopmalVO.java b/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/vo/BOMaSopmalVO.java index d703aac4..002fba0f 100644 --- a/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/vo/BOMaSopmalVO.java +++ b/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/vo/BOMaSopmalVO.java @@ -497,5 +497,6 @@ public class BOMaSopmalVO extends AbstractVO { /** 회원등급 정보 */ private String mbrGradGroupNm; + private String pageDv; }