fo bo 머지작업 - 오류수정

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<DataMap> 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<DataMap> mbrgradList = new ArrayList<>();
+		mbrgradList = service.selectBOMbrGradList(vo);
+
+		Map<String, Object> resultMap = new HashMap<String, Object>();
 		resultMap.put("paramVO", vo);
-		resultMap.put("sopmalList", sopmalList);
+		resultMap.put("resultList", mbrgradList);
+		resultMap.put("paginationInfo", vo.getPaginationInfo());
 
 //		Map<String, Object> resultMap = responseHandler.handleResponseAsMap(
 //				sendToResrc.ofPost(RESRC.GCONEBO, "/admin/store/mbrgrad/selectBOMbrGradListInqire", vo)
 //		);
 
 		/*엑셀 데이터 set*/
-		List<Map<String, Object>> excelList = new ArrayList<>();
-		excelList = (List<Map<String, Object>>) resultMap.get("resultList");
+		List<DataMap> excelList = new ArrayList<>();
+		excelList = (List<DataMap>) resultMap.get("resultList");
 
 		//엑셀 다운로드 다운로드 시간
 		Date date = new Date();
 		SimpleDateFormat excelFormat = new SimpleDateFormat("yyyyMMddHHmmss");
 		String str = excelFormat.format(date);
 
-
 		try {
 			//엑셀 항목에 출력될 내용 설정
 			List<Map<String, Object>> 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<String, Object> dataMap = new HashMap<>();
-					HashMap<String, Object> map = new HashMap<>();
-					map = (HashMap<String, Object>) 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("엑셀다운로드 중 오류가 발생하였습니다.");
 		}
 	}
-
-
 }

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;
 }

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;
 
 }