From a1647eb0c5a0305294256185de0eac07883f32b9 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Mon, 15 May 2023 16:02:48 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=ED=8E=98=EC=9D=B4=EC=A7=95=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 16 ---- .../ens/adm/web/SendRqstMngController.java | 4 +- .../web/StatsBySignTalkByYearController.java | 2 +- .../biz/cmm/web/XitMainController.java | 93 +------------------ .../admin/web/XitAdminDbMngController.java | 2 +- .../web/XitAdminServerFileMngController.java | 2 +- .../web/XitAdminServerLogMngController.java | 2 +- .../web/XitConectionLogMngController.java | 2 +- .../web/XitConectionStatsMngController.java | 2 +- .../auth/web/XitLoginPolicyMngController.java | 2 +- .../batch/web/XitBatchRegMngController.java | 20 +--- .../web/XitBatchResultMngController.java | 2 +- .../web/XitBatchScheduleMngController.java | 20 +--- .../mng/bbs/web/BoardTmplMgtController.java | 14 --- .../mng/bbs/web/XitBasicBbsMngController.java | 2 +- .../bbs/web/XitBbsCreateMngController.java | 2 +- .../bbs/web/XitBbsTmplateMngController.java | 44 +-------- .../mng/bbs/web/XitBbsUseMngController.java | 2 +- .../user/web/XitEntUserRegMngController.java | 2 +- .../user/web/XitGnrUserRegMngController.java | 2 +- .../user/web/XitUserAbsntMngController.java | 19 +--- .../user/web/XitUserEtcOptMngController.java | 20 +--- .../fims/framework/core/aop/LogAopAdvice.java | 4 +- .../utils/pagination/XitPaginationInfo.java | 12 +-- .../fims/framework/support/jpa/Paginator.java | 24 ++--- .../paging/OffsetLimitInterceptor.java | 2 +- .../mybatis/paging/domain/Paginator.java | 24 ++--- .../jackson2/PageListJsonSerializer.java | 2 +- .../PageListAttrHandlerInterceptor.java | 2 +- .../fims/biz/cmm/cmmCarCrackdownCntPopup.jsp | 8 +- .../fims/biz/cmm/cmmCrackdownRcvFilePopup.jsp | 8 +- .../biz/cmm/cmmCtznComplaintHistPopup.jsp | 16 ++-- .../biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp | 20 ++-- .../fims/biz/cmm/cmmIntegratedSearchForm.jsp | 8 +- .../biz/ec/ecCctvCrackdownFileSelPopup.jsp | 8 +- .../fims/biz/ec/ecCctvCrackdownMgtForm.jsp | 8 +- .../jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp | 1 - .../jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp | 8 +- .../biz/ec/ecNatlNewspaperFileSelPopup.jsp | 8 +- .../fims/biz/ec/ecNatlNewspaperMgtForm.jsp | 8 +- .../fims/biz/rt/rtCrackdownMgtMainForm.jsp | 12 +-- .../jsp/fims/biz/rt/rtInitialDataForm.jsp | 8 +- .../jsp/fims/biz/rt/rtRegltMgtForm.jsp | 8 +- .../biz/cmm/answer/cmmAnsTmplForm.jsp | 8 +- .../biz/mng/admin/XitAdminDbMng_list.jsp | 2 +- .../biz/mng/admin/mngConectionLogMgtForm.jsp | 8 +- .../biz/mng/auth/mngAuthAuthorMgtForm.jsp | 8 +- .../biz/mng/auth/mngAuthByUserMgtForm.jsp | 8 +- .../biz/mng/auth/mngAuthGrpMgtForm.jsp | 8 +- .../biz/mng/auth/mngAuthHierarchyMgtForm.jsp | 8 +- .../biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp | 8 +- .../biz/mng/auth/mngAuthRoleMgtForm.jsp | 8 +- .../biz/mng/bbs/mngBoardBasicMgtForm.jsp | 8 +- .../biz/mng/bbs/mngBoardCreateMgtForm.jsp | 8 +- .../biz/mng/bbs/mngBoardCreateSchPopup.jsp | 8 +- .../biz/mng/bbs/mngBoardTmplMgtForm.jsp | 8 +- .../biz/mng/bbs/mngBoardUseMgtForm.jsp | 8 +- .../biz/mng/code/mngCodeCfnMgtForm.jsp | 8 +- .../biz/mng/code/mngCodeDtlMgtForm.jsp | 8 +- .../biz/mng/code/mngCodeGrpMgtForm.jsp | 8 +- .../biz/mng/code/mngZipCodeMgtForm.jsp | 8 +- .../biz/mng/menu/mngMenuByRoleMgtForm.jsp | 8 +- .../framework/biz/mng/menu/mngMenuMgtForm.jsp | 8 +- .../biz/mng/menu/mngProgramMgtForm.jsp | 8 +- .../biz/mng/menu/mngProgramSchPopup.jsp | 8 +- .../framework/biz/mng/usr/mngUserMgtForm.jsp | 8 +- .../jsp/template/fims/templateForm.jsp | 8 +- .../js/fims/biz/common/popupPageNavigation.js | 18 ++-- .../js/fims/framework/cmm/cmmUtil.js | 2 +- 69 files changed, 223 insertions(+), 458 deletions(-) diff --git a/README.md b/README.md index e73ba6b7..80422b1e 100644 --- a/README.md +++ b/README.md @@ -263,22 +263,6 @@ $("#btnClose").on('click', () => { window.close() }); -``` -## JSON Object ModelAndView에서 처리 -```js -// ModelAndView return -gridInfo={"next":null,"perPage":15,"page":1,"totalCount":15,"curRowData":{"regltSeCode":"01","extrlRegltCntcId":"000000001051"},"curRowPos":1,"curGridDataPos":0,"curGridDatas":[{"regltSeCode":"01","extrlRegltCntcId":"000000001051"},{"regltSeCode":"01","extrlRegltCntcId":"000000001052"},{"regltSeCode":"01","extrlRegltCntcId":"000000001065"}]} - -// jstl사용시 보안상의 이유로 " 문자를 " 치환 -// 아래와 같이 처리 -let gridInfo = ''; // string으로 -gridInfo = gridInfo.replace(/"/g, '"'); -gridInfo = JSON.parse(gridInfo); - -// escapeXml = "false" 사용 - xss 보안상 문제 발생 -let gridInfo = ; //객체이므로 "" 미사용 - -let gridInfo = ${gridInfo}; ``` ## JSP include diff --git a/src/main/java/kr/xit/fims/biz/ens/adm/web/SendRqstMngController.java b/src/main/java/kr/xit/fims/biz/ens/adm/web/SendRqstMngController.java index 78db56c5..26938027 100644 --- a/src/main/java/kr/xit/fims/biz/ens/adm/web/SendRqstMngController.java +++ b/src/main/java/kr/xit/fims/biz/ens/adm/web/SendRqstMngController.java @@ -111,7 +111,7 @@ public class SendRqstMngController extends AbstractController { data.put("contents", list); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging model.addAttribute("data", data); //[tui Grid] data /* *************************** @@ -211,7 +211,7 @@ public class SendRqstMngController extends AbstractController { data.put("contents", list); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging model.addAttribute("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/biz/ens/adm/web/StatsBySignTalkByYearController.java b/src/main/java/kr/xit/fims/biz/ens/adm/web/StatsBySignTalkByYearController.java index c2590f0f..23fa06cd 100644 --- a/src/main/java/kr/xit/fims/biz/ens/adm/web/StatsBySignTalkByYearController.java +++ b/src/main/java/kr/xit/fims/biz/ens/adm/web/StatsBySignTalkByYearController.java @@ -106,7 +106,7 @@ public class StatsBySignTalkByYearController extends AbstractController { data.put("contents", list); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging model.addAttribute("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitMainController.java b/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitMainController.java index 06fb5340..95b5b324 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitMainController.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitMainController.java @@ -56,61 +56,7 @@ public class XitMainController extends AbstractController { */ @RequestMapping(name = "", value = "/mainPage", method={RequestMethod.GET, RequestMethod.POST}) public String mainPage(@ModelAttribute("searchVO") XitBasicBbsMngSearchVO searchVO, HttpServletRequest request, ModelMap model, @RequestParam Map param) throws Exception{ -/* - searchVO.setBbsId("BBSMSTR_00001"); - searchVO.setFirstIndex(0); - // List resultList1 = xitBasicBbsMngService.findList(searchVO); //공지사항 - // model.addAttribute("resultList1", resultList1);; - // - // searchVO.setBbsId("BBSMSTR_00003"); - // List resultList2 = xitBasicBbsMngService.findList(searchVO); //업무게시판 - // model.addAttribute("resultList2", resultList2); - - //noinspection unchecked - model.addAttribute("resultList1", CacheServiceUtils.findBaseBbsList(ConvertUtils.toObjectFromClass(searchVO, Map.class))); - searchVO.setBbsId("BBSMSTR_00003"); - //noinspection unchecked - model.addAttribute("resultList2", CacheServiceUtils.findBaseBbsList(ConvertUtils.toObjectFromClass(searchVO, Map.class))); - -// // 공지사항 메인 컨텐츠 조회 시작 --------------------------------- -// BoardVO boardVO = new BoardVO(); -// boardVO.setPageUnit(10); -// boardVO.setPageSize(10); -// boardVO.setBbsId("BBSMSTR_AAAAAAAAAAAA"); -// -// PaginationInfo paginationInfo = new PaginationInfo(); -// -// paginationInfo.setCurrentPageNo(boardVO.getPageIndex()); -// paginationInfo.setRecordCountPerPage(boardVO.getPageUnit()); -// paginationInfo.setPageSize(boardVO.getPageSize()); -// -// boardVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); -// boardVO.setLastIndex(paginationInfo.getLastRecordIndex()); -// boardVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); -// -// Map map = bbsMngService.selectBoardArticles(boardVO, "BBSA02"); -// model.addAttribute("notiList", map.get("resultList")); -// -// -// // 공지사항 메인컨텐츠 조회 끝 ----------------------------------- -// -// // 업무게시판 메인 컨텐츠 조회 시작 ------------------------------- -// boardVO.setPageUnit(5); -// boardVO.setPageSize(10); -// boardVO.setBbsId("BBSMSTR_CCCCCCCCCCCC"); -// -// paginationInfo.setCurrentPageNo(boardVO.getPageIndex()); -// paginationInfo.setRecordCountPerPage(boardVO.getPageUnit()); -// paginationInfo.setPageSize(boardVO.getPageSize()); -// -// boardVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); -// boardVO.setLastIndex(paginationInfo.getLastRecordIndex()); -// boardVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); -// -// model.addAttribute("bbsList", bbsMngService.selectBoardArticles(boardVO, "BBSA02").get("resultList")); -*/ - // 업무게시판 메인컨텐츠 조회 끝 ----------------------------------- return "fims/framework/biz/cmm/XitMain.main"; } @@ -136,46 +82,9 @@ public class XitMainController extends AbstractController { //noinspection unchecked mav.addObject("resultList2", CacheServiceUtils.findBaseBbsList(ConvertUtils.toObjectFromClass(searchVO, Map.class))); - // // 공지사항 메인 컨텐츠 조회 시작 --------------------------------- - // BoardVO boardVO = new BoardVO(); - // boardVO.setPageUnit(10); - // boardVO.setPageSize(10); - // boardVO.setBbsId("BBSMSTR_AAAAAAAAAAAA"); - // - // PaginationInfo paginationInfo = new PaginationInfo(); - // - // paginationInfo.setCurrentPageNo(boardVO.getPageIndex()); - // paginationInfo.setRecordCountPerPage(boardVO.getPageUnit()); - // paginationInfo.setPageSize(boardVO.getPageSize()); - // - // boardVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - // boardVO.setLastIndex(paginationInfo.getLastRecordIndex()); - // boardVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - // - // Map map = bbsMngService.selectBoardArticles(boardVO, "BBSA02"); - // model.addAttribute("notiList", map.get("resultList")); - // - // - // // 공지사항 메인컨텐츠 조회 끝 ----------------------------------- - // - // // 업무게시판 메인 컨텐츠 조회 시작 ------------------------------- - // boardVO.setPageUnit(5); - // boardVO.setPageSize(10); - // boardVO.setBbsId("BBSMSTR_CCCCCCCCCCCC"); - // - // paginationInfo.setCurrentPageNo(boardVO.getPageIndex()); - // paginationInfo.setRecordCountPerPage(boardVO.getPageUnit()); - // paginationInfo.setPageSize(boardVO.getPageSize()); - // - // boardVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - // boardVO.setLastIndex(paginationInfo.getLastRecordIndex()); - // boardVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - // - // model.addAttribute("bbsList", bbsMngService.selectBoardArticles(boardVO, "BBSA02").get("resultList")); - // 업무게시판 메인컨텐츠 조회 끝 ----------------------------------- return mav; - //return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/XitMain2"; + } /** diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitAdminDbMngController.java b/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitAdminDbMngController.java index dc5c6ffc..e0e538d5 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitAdminDbMngController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitAdminDbMngController.java @@ -126,7 +126,7 @@ public class XitAdminDbMngController extends AbstractController { data.put("contents", list); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging resultMap.put("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitAdminServerFileMngController.java b/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitAdminServerFileMngController.java index de20a656..77f4b918 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitAdminServerFileMngController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitAdminServerFileMngController.java @@ -147,7 +147,7 @@ public class XitAdminServerFileMngController extends AbstractController { data.put("contents", list); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging resultMap.put("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitAdminServerLogMngController.java b/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitAdminServerLogMngController.java index eded38a3..62ae2f92 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitAdminServerLogMngController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitAdminServerLogMngController.java @@ -351,7 +351,7 @@ public class XitAdminServerLogMngController extends AbstractController { data.put("contents", list); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging resultMap.put("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitConectionLogMngController.java b/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitConectionLogMngController.java index 78060535..04219987 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitConectionLogMngController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitConectionLogMngController.java @@ -98,7 +98,7 @@ public class XitConectionLogMngController extends AbstractController { data.put("contents", xitConectionLogMngService.findList(searchVO)); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging resultMap.put("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitConectionStatsMngController.java b/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitConectionStatsMngController.java index 6b4793a6..151f9d1a 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitConectionStatsMngController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/admin/web/XitConectionStatsMngController.java @@ -122,7 +122,7 @@ public class XitConectionStatsMngController extends AbstractController { data.put("contents", xitConectionStatsMngService.findList(searchVO)); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); -// pagination.put("totalCount", totCnt); + data.put("pagination", pagination); //[tui Grid] data-paging resultMap.put("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/auth/web/XitLoginPolicyMngController.java b/src/main/java/kr/xit/fims/framework/biz/mng/auth/web/XitLoginPolicyMngController.java index 8aa97ba4..9cf8a5b6 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/auth/web/XitLoginPolicyMngController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/auth/web/XitLoginPolicyMngController.java @@ -96,7 +96,7 @@ public class XitLoginPolicyMngController extends AbstractController { data.put("contents", xitLoginPolicyMngService.findList(searchVO)); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); -// pagination.put("totalCount", totCnt); + data.put("pagination", pagination); //[tui Grid] data-paging resultMap.put("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/batch/web/XitBatchRegMngController.java b/src/main/java/kr/xit/fims/framework/biz/mng/batch/web/XitBatchRegMngController.java index 9f88f880..b7c3f952 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/batch/web/XitBatchRegMngController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/batch/web/XitBatchRegMngController.java @@ -70,25 +70,7 @@ public class XitBatchRegMngController extends AbstractController { @RequestMapping(name = "", value = "BatchRegMng_list", method={RequestMethod.GET, RequestMethod.POST}) public String BatchRegMng_list(@ModelAttribute("searchVO") XitBatchRegMngSearchVO searchVO, ModelMap model) { - /** paging */ - //PaginationInfo paginationInfo = new PaginationInfo(); - //paginationInfo.setCurrentPageNo(searchVO.getPageIndex()); - //paginationInfo.setRecordCountPerPage(searchVO.getPageUnit()); - //paginationInfo.setPageSize(searchVO.getPageSize()); - //searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - //searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); - //searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - - //List resultList = (List) xitBatchRegMngService.findList(searchVO); - //int totCnt = xitBatchRegMngService.findListTotCnt(searchVO); - - //paginationInfo.setTotalRecordCount(totCnt); - - //model.addAttribute("resultList", resultList); - //model.addAttribute("resultCnt", totCnt); - //model.addAttribute("paginationInfo", paginationInfo); - //model.addAttribute("message", xitMessageSource.getMessage("success.common.select")); return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/batch/XitBatchRegMng_list"; } @@ -131,7 +113,7 @@ public class XitBatchRegMngController extends AbstractController { data.put("contents", resultList); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging resultMap.put("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/batch/web/XitBatchResultMngController.java b/src/main/java/kr/xit/fims/framework/biz/mng/batch/web/XitBatchResultMngController.java index 2cc61685..ee8e06ee 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/batch/web/XitBatchResultMngController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/batch/web/XitBatchResultMngController.java @@ -105,7 +105,7 @@ public class XitBatchResultMngController extends AbstractController { data.put("contents", xitBatchResultMngService.findList(searchVO)); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging resultMap.put("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/batch/web/XitBatchScheduleMngController.java b/src/main/java/kr/xit/fims/framework/biz/mng/batch/web/XitBatchScheduleMngController.java index 9504c148..75840f9b 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/batch/web/XitBatchScheduleMngController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/batch/web/XitBatchScheduleMngController.java @@ -70,25 +70,7 @@ public class XitBatchScheduleMngController extends AbstractController { @RequestMapping(name = "", value = "BatchScheduleMng_list", method={RequestMethod.GET, RequestMethod.POST}) public String BatchScheduleMng_list(@ModelAttribute("searchVO") XitBatchScheduleMngSearchVO searchVO, ModelMap model) { - /** paging */ - //PaginationInfo paginationInfo = new PaginationInfo(); - //paginationInfo.setCurrentPageNo(searchVO.getPageIndex()); - //paginationInfo.setRecordCountPerPage(searchVO.getPageUnit()); - //paginationInfo.setPageSize(searchVO.getPageSize()); - //searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - //searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); - //searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - - //List resultList = (List) xitBatchScheduleMngService.findList(searchVO); - //int totCnt = xitBatchScheduleMngService.findListTotCnt(searchVO); - - //paginationInfo.setTotalRecordCount(totCnt); - - //model.addAttribute("resultList", resultList); - //model.addAttribute("resultCnt", totCnt); - //model.addAttribute("paginationInfo", paginationInfo); - //model.addAttribute("message", xitMessageSource.getMessage("success.common.select")); return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/batch/XitBatchScheduleMng_list"; } @@ -131,7 +113,7 @@ public class XitBatchScheduleMngController extends AbstractController { data.put("contents", resultList); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging resultMap.put("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/BoardTmplMgtController.java b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/BoardTmplMgtController.java index ae6c791c..a01a5ebc 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/BoardTmplMgtController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/BoardTmplMgtController.java @@ -81,20 +81,6 @@ public class BoardTmplMgtController extends AbstractController { master.setBbsNm("미리보기 게시판"); - // vo.setPageUnit(PAGE_UNIT); - // vo.setPageSize(PAGE_SIZE); - // - // PaginationInfo paginationInfo = new PaginationInfo(); - // - // paginationInfo.setCurrentPageNo(vo.getPageIndex()); - // paginationInfo.setRecordCountPerPage(vo.getPageUnit()); - // paginationInfo.setPageSize(vo.getPageSize()); - // - // vo.setFirstIndex(paginationInfo.getFirstRecordIndex()); - // vo.setLastIndex(paginationInfo.getLastRecordIndex()); - // vo.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - - XitBasicBbsMngVO target = null; List list = new ArrayList(); diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/XitBasicBbsMngController.java b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/XitBasicBbsMngController.java index 0262b341..a99dd121 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/XitBasicBbsMngController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/XitBasicBbsMngController.java @@ -186,7 +186,7 @@ public class XitBasicBbsMngController extends AbstractController { data.put("contents", xitBasicBbsMngService.findList(searchVO)); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging resultMap.put("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/XitBbsCreateMngController.java b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/XitBbsCreateMngController.java index b4ea2a65..66aea5ab 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/XitBbsCreateMngController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/XitBbsCreateMngController.java @@ -135,7 +135,7 @@ public class XitBbsCreateMngController extends AbstractController { data.put("contents", xitBbsCreateMngService.findList(searchVO)); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging resultMap.put("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/XitBbsTmplateMngController.java b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/XitBbsTmplateMngController.java index 155b82d1..5f443e60 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/XitBbsTmplateMngController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/XitBbsTmplateMngController.java @@ -103,7 +103,7 @@ public class XitBbsTmplateMngController extends AbstractController { data.put("contents", xitBbsTmplateMngService.findList(searchVO)); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging resultMap.put("data", data); //[tui Grid] data /* *************************** @@ -174,47 +174,7 @@ public class XitBbsTmplateMngController extends AbstractController { ) { switch (cmd) { case "choice": //템플릿 선택 팝업 - /* ============================== - * 2020.10.06 박민규 - * tui-grid로 전환 - * -tui-grid로 전환함에 따라 주석처리 함 - ============================== */ - //2020.10.06 박민규 -// String typeFlag = (String) commandMap.get("typeFlag"); -// -// if ("CLB".equals(typeFlag)) { -// searchVO.setTypeFlag(typeFlag); -// searchVO.setTmplatSeCode("TMPT03"); -// } else if ("CMY".equals(typeFlag)) { -// searchVO.setTypeFlag(typeFlag); -// searchVO.setTmplatSeCode("TMPT02"); -// } else { -// searchVO.setTypeFlag(typeFlag); -// searchVO.setTmplatSeCode("TMPT01"); -// } -// -// searchVO.setPageUnit(Integer.parseInt(XitProperties.getProperty("Globals.Xit.Pagination.PageUnit"))); -// searchVO.setPageSize(Integer.parseInt(XitProperties.getProperty("Globals.Xit.Pagination.PageSize"))); -// //CMY, CLB -// -// PaginationInfo paginationInfo = new PaginationInfo(); -// -// paginationInfo.setCurrentPageNo(searchVO.getPageIndex()); -// paginationInfo.setRecordCountPerPage(searchVO.getPageUnit()); -// paginationInfo.setPageSize(searchVO.getPageSize()); -// -// searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); -// searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); -// searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); -// -// List resultList = xitBbsTmplateMngService.findList(searchVO); -// int totCnt = xitBbsTmplateMngService.findListTotCnt(searchVO); -// -// paginationInfo.setTotalRecordCount(totCnt); -// -// model.addAttribute("resultList", resultList); -// model.addAttribute("resultCnt", totCnt); -// model.addAttribute("paginationInfo", paginationInfo); + break; default: throw new RuntimeException("유효하지 않은 요청 입니다."); diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/XitBbsUseMngController.java b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/XitBbsUseMngController.java index 09ea325b..3bba5b71 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/XitBbsUseMngController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/web/XitBbsUseMngController.java @@ -104,7 +104,7 @@ public class XitBbsUseMngController extends AbstractController { data.put("contents", xitBbsUseMngService.findList(searchVO)); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging resultMap.put("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/web/XitEntUserRegMngController.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/web/XitEntUserRegMngController.java index f947158a..66023def 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/web/XitEntUserRegMngController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/web/XitEntUserRegMngController.java @@ -134,7 +134,7 @@ public class XitEntUserRegMngController extends AbstractController { data.put("contents", xitEntUserRegMngService.findList(searchVO)); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging resultMap.put("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/web/XitGnrUserRegMngController.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/web/XitGnrUserRegMngController.java index 23c5f457..b5f4599a 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/web/XitGnrUserRegMngController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/web/XitGnrUserRegMngController.java @@ -133,7 +133,7 @@ public class XitGnrUserRegMngController extends AbstractController { data.put("contents", xitGnrUserRegMngService.findList(searchVO)); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging resultMap.put("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/web/XitUserAbsntMngController.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/web/XitUserAbsntMngController.java index ba277873..99fcf162 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/web/XitUserAbsntMngController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/web/XitUserAbsntMngController.java @@ -65,24 +65,7 @@ public class XitUserAbsntMngController extends AbstractController { @RequestMapping(name = "", value = "UserAbsntMng_list", method={RequestMethod.GET, RequestMethod.POST}) public String UserAbsntMng_list(@RequestParam(value="selAbsnceAt", required=false, defaultValue="") String selAbsnceAt, @ModelAttribute("userAbsnceVO") XitUserAbsntMngSearchVO searchVO, ModelMap model) { - /** paging */ - //PaginationInfo paginationInfo = new PaginationInfo(); - //paginationInfo.setCurrentPageNo(searchVO.getPageIndex()); - //paginationInfo.setRecordCountPerPage(searchVO.getPageUnit()); - //paginationInfo.setPageSize(searchVO.getPageSize()); - - //searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - //searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); - //searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - - //searchVO.setSelAbsnceAt(selAbsnceAt); - //searchVO.setUserAbsnceList(xitUserAbsntMngService.findList(searchVO)); - - //model.addAttribute("userAbsnceList", searchVO.getUserAbsnceList()); - //int totCnt = xitUserAbsntMngService.findListTotCnt(searchVO); - //paginationInfo.setTotalRecordCount(totCnt); - //model.addAttribute("paginationInfo", paginationInfo); model.addAttribute("message", xitMessageSource.getMessage("success.common.select")); @@ -127,7 +110,7 @@ public class XitUserAbsntMngController extends AbstractController { data.put("contents", xitUserAbsntMngService.findList(searchVO)); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging resultMap.put("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/web/XitUserEtcOptMngController.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/web/XitUserEtcOptMngController.java index f52730bc..a7c39bf8 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/web/XitUserEtcOptMngController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/web/XitUserEtcOptMngController.java @@ -57,24 +57,6 @@ public class XitUserEtcOptMngController extends AbstractController { @RequestMapping(name = "", value = "UserEtcOptMng_list", method={RequestMethod.GET, RequestMethod.POST}) public String UserEtcOptMng_list(@ModelAttribute("userSearchVO") XitUserEtcOptMngSearchVO searchVO, ModelMap model) { -// searchVO.setPageUnit(Integer.parseInt(XitProperties.getProperty("Globals.Xit.Pagination.PageUnit"))); -// searchVO.setPageSize(Integer.parseInt(XitProperties.getProperty("Globals.Xit.Pagination.PageSize"))); -// -// /** pageing */ -// PaginationInfo paginationInfo = new PaginationInfo(); -// paginationInfo.setCurrentPageNo(searchVO.getPageIndex()); -// paginationInfo.setRecordCountPerPage(searchVO.getPageUnit()); -// paginationInfo.setPageSize(searchVO.getPageSize()); -// -// searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); -// searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); -// searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); -// -// model.addAttribute("resultList", xitUserEtcOptMngService.findList(searchVO)); -// -// int totCnt = xitUserEtcOptMngService.findListTotCnt(searchVO); -// paginationInfo.setTotalRecordCount(totCnt); -// model.addAttribute("paginationInfo", paginationInfo); /*================ * 코드목록 조회 @@ -123,7 +105,7 @@ public class XitUserEtcOptMngController extends AbstractController { data.put("contents", xitUserEtcOptMngService.findList(searchVO)); //[tui Grid] data-contents Map pagination = new HashMap(); pagination.put("pageNum", searchVO.getPageNum()); - pagination.put("totalCount", totCnt); + pagination.put("totalSize", totCnt); data.put("pagination", pagination); //[tui Grid] data-paging resultMap.put("data", data); //[tui Grid] data /* *************************** diff --git a/src/main/java/kr/xit/fims/framework/core/aop/LogAopAdvice.java b/src/main/java/kr/xit/fims/framework/core/aop/LogAopAdvice.java index 148c66d2..d66d1471 100644 --- a/src/main/java/kr/xit/fims/framework/core/aop/LogAopAdvice.java +++ b/src/main/java/kr/xit/fims/framework/core/aop/LogAopAdvice.java @@ -175,11 +175,9 @@ public class LogAopAdvice { private Map getPageInfoMap(Paginator paginator){ Map map = new HashMap(); - //map.put("recods", paginator.getTotalCount()); map.put("totalPage", paginator.getTotalPages()); - map.put("totalCount", paginator.getTotalCount()); + map.put("totalSize", paginator.getTotalSize()); map.put("pageNum", paginator.getPageNum()); - //map.put("rowNum", paginator.getLimit()); // // // Query Data : Paging 정보만 set 하면 되므로 필요 없다 // //map.put(FwConstants.DEFAULT_RESPONSE_BODY_DATA_NAME, new ArrayList(pageList)); diff --git a/src/main/java/kr/xit/fims/framework/core/utils/pagination/XitPaginationInfo.java b/src/main/java/kr/xit/fims/framework/core/utils/pagination/XitPaginationInfo.java index 4f11b18a..ca894e0b 100644 --- a/src/main/java/kr/xit/fims/framework/core/utils/pagination/XitPaginationInfo.java +++ b/src/main/java/kr/xit/fims/framework/core/utils/pagination/XitPaginationInfo.java @@ -20,7 +20,7 @@ public class XitPaginationInfo extends PaginationInfo{ /** 현재 페이지 */ private int pageNum = -1; /** 모든 로우들의 개수(=조회 총 건수) */ - private int totalCount = -1; + private int totalSize = -1; /* ************************* * //tui Grid Paging 필드 ************************* */ @@ -36,13 +36,13 @@ public class XitPaginationInfo extends PaginationInfo{ super.setCurrentPageNo(pageNum); } /** [tui Grid] 조회 총 건수를 설정 한다. */ - public int getTotalCount() { - return totalCount; + public int getTotalSize() { + return totalSize; } /** [tui Grid] 조회 총 건수를 반환 한다. */ - public void setTotalCount(int totalCount) { - this.totalCount = totalCount; - super.setTotalRecordCount(totalCount); + public void setTotalSize(int totalSize) { + this.totalSize = totalSize; + super.setTotalRecordCount(totalSize); } diff --git a/src/main/java/kr/xit/fims/framework/support/jpa/Paginator.java b/src/main/java/kr/xit/fims/framework/support/jpa/Paginator.java index d9e288a5..485e1815 100644 --- a/src/main/java/kr/xit/fims/framework/support/jpa/Paginator.java +++ b/src/main/java/kr/xit/fims/framework/support/jpa/Paginator.java @@ -11,12 +11,12 @@ public class Paginator implements Serializable { private final int limit; private int pageNum = 1; - private final int totalCount; + private final int totalSize; - public Paginator(int pageNum, int limit, int totalCount) { + public Paginator(int pageNum, int limit, int totalSize) { super(); this.limit = limit; - this.totalCount = totalCount; + this.totalSize = totalSize; this.pageNum = computePageNo(pageNum); } @@ -36,8 +36,8 @@ public class Paginator implements Serializable { return limit; } - public int getTotalCount() { - return totalCount; + public int getTotalSize() { + return totalSize; } public boolean isFirstPage() { @@ -77,13 +77,13 @@ public class Paginator implements Serializable { } public int getStartRow() { - if (getLimit() <= 0 || totalCount <= 0) + if (getLimit() <= 0 || totalSize <= 0) return 0; return pageNum > 0 ? (pageNum - 1) * getLimit() + 1 : 0; } public int getEndRow() { - return pageNum > 0 ? Math.min(limit * pageNum, getTotalCount()) : 0; + return pageNum > 0 ? Math.min(limit * pageNum, getTotalSize()) : 0; } public int getOffset() { @@ -91,22 +91,22 @@ public class Paginator implements Serializable { } public int getTotalPages() { - if (totalCount <= 0) { + if (totalSize <= 0) { return 0; } if (limit <= 0) { return 0; } - int count = totalCount / limit; - if (totalCount % limit > 0) { + int count = totalSize / limit; + if (totalSize % limit > 0) { count++; } return count; } protected int computePageNo(int pageNum) { - return computePageNumber(pageNum, limit, totalCount); + return computePageNumber(pageNum, limit, totalSize); } private static int computeLastPageNumber(int totalItems, int pageSize) { @@ -137,7 +137,7 @@ public class Paginator implements Serializable { sb.append("Paginator"); sb.append("{pageNum=").append(pageNum); sb.append(", limit=").append(limit); - sb.append(", totalCount=").append(totalCount); + sb.append(", totalSize=").append(totalSize); sb.append('}'); return sb.toString(); } diff --git a/src/main/java/kr/xit/fims/framework/support/mybatis/paging/OffsetLimitInterceptor.java b/src/main/java/kr/xit/fims/framework/support/mybatis/paging/OffsetLimitInterceptor.java index f0253c01..5f1a2036 100644 --- a/src/main/java/kr/xit/fims/framework/support/mybatis/paging/OffsetLimitInterceptor.java +++ b/src/main/java/kr/xit/fims/framework/support/mybatis/paging/OffsetLimitInterceptor.java @@ -29,7 +29,7 @@ import java.util.Properties; import java.util.concurrent.*; /** - * Paging 정보 - Paginator(page, limit, totalcount)- 획득, 추가 + * Paging 정보 - Paginator(pageNum, limit, totalSize)- 획득, 추가 */ @Intercepts({ @Signature(type = Executor.class, method = "query", diff --git a/src/main/java/kr/xit/fims/framework/support/mybatis/paging/domain/Paginator.java b/src/main/java/kr/xit/fims/framework/support/mybatis/paging/domain/Paginator.java index 354c2c52..e8f1909d 100644 --- a/src/main/java/kr/xit/fims/framework/support/mybatis/paging/domain/Paginator.java +++ b/src/main/java/kr/xit/fims/framework/support/mybatis/paging/domain/Paginator.java @@ -11,12 +11,12 @@ public class Paginator implements Serializable { private final int limit; private int pageNum = 1; - private final int totalCount; + private final int totalSize; - public Paginator(int pageNum, int limit, int totalCount) { + public Paginator(int pageNum, int limit, int totalSize) { super(); this.limit = limit; - this.totalCount = totalCount; + this.totalSize = totalSize; this.pageNum = computePageNo(pageNum); } @@ -36,8 +36,8 @@ public class Paginator implements Serializable { return limit; } - public int getTotalCount() { - return totalCount; + public int getTotalSize() { + return totalSize; } public boolean isFirstPage() { @@ -77,13 +77,13 @@ public class Paginator implements Serializable { } public int getStartRow() { - if (getLimit() <= 0 || totalCount <= 0) + if (getLimit() <= 0 || totalSize <= 0) return 0; return pageNum > 0 ? (pageNum - 1) * getLimit() + 1 : 0; } public int getEndRow() { - return pageNum > 0 ? Math.min(limit * pageNum, getTotalCount()) : 0; + return pageNum > 0 ? Math.min(limit * pageNum, getTotalSize()) : 0; } public int getOffset() { @@ -91,22 +91,22 @@ public class Paginator implements Serializable { } public int getTotalPages() { - if (totalCount <= 0) { + if (totalSize <= 0) { return 0; } if (limit <= 0) { return 0; } - int count = totalCount / limit; - if (totalCount % limit > 0) { + int count = totalSize / limit; + if (totalSize % limit > 0) { count++; } return count; } protected int computePageNo(int pageNum) { - return computePageNumber(pageNum, limit, totalCount); + return computePageNumber(pageNum, limit, totalSize); } private static int computeLastPageNumber(int totalItems, int pageSize) { @@ -136,7 +136,7 @@ public class Paginator implements Serializable { return "Paginator" + "{pageNum=" + pageNum + ", limit=" + limit + - ", totalCount=" + totalCount + + ", totalSize=" + totalSize + '}'; } } diff --git a/src/main/java/kr/xit/fims/framework/support/mybatis/paging/jackson2/PageListJsonSerializer.java b/src/main/java/kr/xit/fims/framework/support/mybatis/paging/jackson2/PageListJsonSerializer.java index 28927290..9b43fb46 100644 --- a/src/main/java/kr/xit/fims/framework/support/mybatis/paging/jackson2/PageListJsonSerializer.java +++ b/src/main/java/kr/xit/fims/framework/support/mybatis/paging/jackson2/PageListJsonSerializer.java @@ -25,7 +25,7 @@ public class PageListJsonSerializer extends JsonSerializer{ Paginator paginator = value.getPaginator(); Map map = new HashMap<>(); - map.put("totalCount", paginator.getTotalCount()); + map.put("totalSize", paginator.getTotalSize()); map.put("totalPages", paginator.getTotalPages()); map.put("pageNum", paginator.getPageNum()); map.put("limit", paginator.getLimit()); diff --git a/src/main/java/kr/xit/fims/framework/support/mybatis/paging/springmvc/PageListAttrHandlerInterceptor.java b/src/main/java/kr/xit/fims/framework/support/mybatis/paging/springmvc/PageListAttrHandlerInterceptor.java index 8e64990d..739b561e 100644 --- a/src/main/java/kr/xit/fims/framework/support/mybatis/paging/springmvc/PageListAttrHandlerInterceptor.java +++ b/src/main/java/kr/xit/fims/framework/support/mybatis/paging/springmvc/PageListAttrHandlerInterceptor.java @@ -57,7 +57,7 @@ public class PageListAttrHandlerInterceptor extends HandlerInterceptorAdapter { private Map getPageInfoMap(Paginator paginator){ Map map = new HashMap(); - map.put("totalCount", paginator.getTotalCount()); + map.put("totalSize", paginator.getTotalSize()); map.put("totalPages", paginator.getTotalPages()); map.put("pageNum", paginator.getPageNum()); map.put("limit", paginator.getLimit()); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCarCrackdownCntPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCarCrackdownCntPopup.jsp index d59905ce..b1e2a6b3 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCarCrackdownCntPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCarCrackdownCntPopup.jsp @@ -59,10 +59,10 @@ Date Author Description let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -71,14 +71,14 @@ Date Author Description if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCrackdownRcvFilePopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCrackdownRcvFilePopup.jsp index 7bc430d9..cb6ac477 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCrackdownRcvFilePopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCrackdownRcvFilePopup.jsp @@ -89,10 +89,10 @@ Date Author Description let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -101,14 +101,14 @@ Date Author Description if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCtznComplaintHistPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCtznComplaintHistPopup.jsp index 092f98cb..35eaf24d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCtznComplaintHistPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCtznComplaintHistPopup.jsp @@ -82,10 +82,10 @@ Date Author Description let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -94,14 +94,14 @@ Date Author Description if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid_cplnt", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); @@ -142,10 +142,10 @@ Date Author Description let pagination = obj.data.pagination; if(obj.data.pagination){ - $2$Control._paginationInfo.totalCount = pagination.totalCount; + $2$Control._paginationInfo.totalSize = pagination.totalSize; $2$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $2$Control._paginationInfo.totalCount = obj.count; + $2$Control._paginationInfo.totalSize = obj.count; } $2$Control.totalCountSetting(obj); @@ -154,14 +154,14 @@ Date Author Description if($2$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $2$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $2$Control._paginationInfo.fetchSize){ start = $2$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid2Paging").setPaging({ list: $2$Control.dataset, prefix: "grid_vhcle_no_cplnt", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $2$Control._paginationInfo.fetchSize, func: "$$$2Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp index 5b261229..994c4a9b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp @@ -713,10 +713,10 @@ Date Author Description let pagination = obj.data.pagination; if(obj.data.pagination){ - $1$Control._paginationInfo.totalCount = pagination.totalCount; + $1$Control._paginationInfo.totalSize = pagination.totalSize; $1$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $1$Control._paginationInfo.totalCount = obj.count; + $1$Control._paginationInfo.totalSize = obj.count; } } @@ -741,10 +741,10 @@ Date Author Description if(obj.data.pagination != null) { let pagination = obj.data.pagination; if(obj.data.pagination){ - $2$Control._paginationInfo.totalCount = pagination.totalCount; + $2$Control._paginationInfo.totalSize = pagination.totalSize; $2$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $2$Control._paginationInfo.totalCount = obj.count; + $2$Control._paginationInfo.totalSize = obj.count; } } $2$Control.totalCountSetting(obj); @@ -768,10 +768,10 @@ Date Author Description if(obj.data.pagination != null) { let pagination = obj.data.pagination; if(obj.data.pagination){ - $3$Control._paginationInfo.totalCount = pagination.totalCount; + $3$Control._paginationInfo.totalSize = pagination.totalSize; $3$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $3$Control._paginationInfo.totalCount = obj.count; + $3$Control._paginationInfo.totalSize = obj.count; } } $3$Control.totalCountSetting(obj); @@ -795,10 +795,10 @@ Date Author Description if(obj.data.pagination != null) { let pagination = obj.data.pagination; if(obj.data.pagination){ - $4$Control._paginationInfo.totalCount = pagination.totalCount; + $4$Control._paginationInfo.totalSize = pagination.totalSize; $4$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $4$Control._paginationInfo.totalCount = obj.count; + $4$Control._paginationInfo.totalSize = obj.count; } } $4$Control.totalCountSetting(obj); @@ -822,10 +822,10 @@ Date Author Description if(obj.data.pagination != null) { let pagination = obj.data.pagination; if(obj.data.pagination){ - $5$Control._paginationInfo.totalCount = pagination.totalCount; + $5$Control._paginationInfo.totalSize = pagination.totalSize; $5$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $5$Control._paginationInfo.totalCount = obj.count; + $5$Control._paginationInfo.totalSize = obj.count; } } $5$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmIntegratedSearchForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmIntegratedSearchForm.jsp index 437d3e64..de9f2ffb 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmIntegratedSearchForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmIntegratedSearchForm.jsp @@ -288,10 +288,10 @@ Date Author Description let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -300,14 +300,14 @@ Date Author Description if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp index 689dfc5b..7eb7358e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp @@ -78,10 +78,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -90,14 +90,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp index 51adc7d9..0289a9fc 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp @@ -74,10 +74,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -86,14 +86,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp index 1dc5caa0..b159202c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp @@ -5,7 +5,6 @@ <%--rcvXmlDTO--%> -<%----%>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp index 28c95e38..7fb65636 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp @@ -88,10 +88,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -100,14 +100,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperFileSelPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperFileSelPopup.jsp index bb82ac55..cedee6dc 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperFileSelPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperFileSelPopup.jsp @@ -75,10 +75,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -87,14 +87,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtForm.jsp index 66c505be..8164c885 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtForm.jsp @@ -72,10 +72,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -84,14 +84,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp index 4186f19e..9618177b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp @@ -222,10 +222,10 @@ Date Author Description let pagination = obj.data.pagination; if(obj.data.pagination){ - $1$Control._paginationInfo.totalCount = pagination.totalCount; + $1$Control._paginationInfo.totalSize = pagination.totalSize; $1$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $1$Control._paginationInfo.totalCount = obj.count; + $1$Control._paginationInfo.totalSize = obj.count; } $1$Control.totalCountSetting(obj); @@ -252,10 +252,10 @@ Date Author Description let pagination = obj.data.pagination; if(obj.data.pagination){ - $2$Control._paginationInfo.totalCount = pagination.totalCount; + $2$Control._paginationInfo.totalSize = pagination.totalSize; $2$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $2$Control._paginationInfo.totalCount = obj.count; + $2$Control._paginationInfo.totalSize = obj.count; } $2$Control.totalCountSetting(obj); @@ -282,10 +282,10 @@ Date Author Description let pagination = obj.data.pagination; if(obj.data.pagination){ - $3$Control._paginationInfo.totalCount = pagination.totalCount; + $3$Control._paginationInfo.totalSize = pagination.totalSize; $3$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $3$Control._paginationInfo.totalCount = obj.count; + $3$Control._paginationInfo.totalSize = obj.count; } $3$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp index b66a62a3..e950d87d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp @@ -215,10 +215,10 @@ Date Author Description let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -227,14 +227,14 @@ Date Author Description if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtForm.jsp index 9bc989cf..98dc7e06 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtForm.jsp @@ -75,10 +75,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -87,14 +87,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/answer/cmmAnsTmplForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/answer/cmmAnsTmplForm.jsp index f0bae554..246e954c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/answer/cmmAnsTmplForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/answer/cmmAnsTmplForm.jsp @@ -94,10 +94,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -106,14 +106,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/XitAdminDbMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/XitAdminDbMng_list.jsp index b77c581a..d8771bef 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/XitAdminDbMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/XitAdminDbMng_list.jsp @@ -157,7 +157,7 @@ var XitAdminDbMng_list = { return false; } //조회건수 - const cnt = data.data.pagination.totalCount; + const cnt = data.data.pagination.totalSize; if(cnt==0) return false; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/mngConectionLogMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/mngConectionLogMgtForm.jsp index d686781e..eee26249 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/mngConectionLogMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/mngConectionLogMgtForm.jsp @@ -69,10 +69,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -81,14 +81,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp index 2683e5e2..3469a420 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp @@ -71,10 +71,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -83,14 +83,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthByUserMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthByUserMgtForm.jsp index 704564a8..69d48453 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthByUserMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthByUserMgtForm.jsp @@ -73,10 +73,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -85,14 +85,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp index 503ebb2c..03e7db4b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp @@ -70,10 +70,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -82,14 +82,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp index 63149f14..86562a41 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp @@ -72,10 +72,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -84,14 +84,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp index 09224c26..13807869 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp @@ -78,10 +78,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -90,14 +90,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp index c750f95b..b564e7c0 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp @@ -71,10 +71,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -83,14 +83,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardBasicMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardBasicMgtForm.jsp index 26accd60..013944ca 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardBasicMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardBasicMgtForm.jsp @@ -81,10 +81,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -93,14 +93,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardCreateMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardCreateMgtForm.jsp index 2a5993ca..9e0adbfd 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardCreateMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardCreateMgtForm.jsp @@ -73,10 +73,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -85,14 +85,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardCreateSchPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardCreateSchPopup.jsp index 60cacf6b..781f25fc 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardCreateSchPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardCreateSchPopup.jsp @@ -76,10 +76,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -88,14 +88,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardTmplMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardTmplMgtForm.jsp index 47f58de2..4015da96 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardTmplMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardTmplMgtForm.jsp @@ -75,10 +75,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -87,14 +87,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardUseMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardUseMgtForm.jsp index f5b83ae0..14465495 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardUseMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardUseMgtForm.jsp @@ -72,10 +72,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -84,14 +84,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeCfnMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeCfnMgtForm.jsp index 6beb3b65..b3fe37fc 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeCfnMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeCfnMgtForm.jsp @@ -72,10 +72,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -84,14 +84,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeDtlMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeDtlMgtForm.jsp index 732ea7ba..0fe9e5ae 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeDtlMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeDtlMgtForm.jsp @@ -86,10 +86,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -98,14 +98,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeGrpMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeGrpMgtForm.jsp index 9e848028..6573e411 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeGrpMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeGrpMgtForm.jsp @@ -80,10 +80,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -92,14 +92,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngZipCodeMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngZipCodeMgtForm.jsp index e481db72..37f26636 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngZipCodeMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngZipCodeMgtForm.jsp @@ -79,10 +79,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -91,14 +91,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuByRoleMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuByRoleMgtForm.jsp index 564d2c75..850855a6 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuByRoleMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuByRoleMgtForm.jsp @@ -64,10 +64,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -76,14 +76,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuMgtForm.jsp index a7da6e19..804d01e5 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuMgtForm.jsp @@ -78,10 +78,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -90,14 +90,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngProgramMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngProgramMgtForm.jsp index ac7dfaee..111c3ae7 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngProgramMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngProgramMgtForm.jsp @@ -73,10 +73,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -85,14 +85,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngProgramSchPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngProgramSchPopup.jsp index c597c86d..57698794 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngProgramSchPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngProgramSchPopup.jsp @@ -76,10 +76,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -88,14 +88,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtForm.jsp index ec8d2865..c867446d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtForm.jsp @@ -81,10 +81,10 @@ let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -93,14 +93,14 @@ if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/WEB-INF/jsp/template/fims/templateForm.jsp b/src/main/webapp/WEB-INF/jsp/template/fims/templateForm.jsp index c236b128..bd2c1963 100644 --- a/src/main/webapp/WEB-INF/jsp/template/fims/templateForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/template/fims/templateForm.jsp @@ -101,10 +101,10 @@ Date Author Description let pagination = obj.data.pagination; if(obj.data.pagination){ - $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.totalSize = pagination.totalSize; $$Control._paginationInfo.pageNum = pagination.pageNum; } else { - $$Control._paginationInfo.totalCount = obj.count; + $$Control._paginationInfo.totalSize = obj.count; } $$Control.totalCountSetting(obj); @@ -113,14 +113,14 @@ Date Author Description if($$Control._paginationInfo.pagingType != "scroll"){ let start = 0; - if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ + if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalSize > $$Control._paginationInfo.fetchSize){ start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1); } $("#grid1Paging").setPaging({ list: $$Control.dataset, prefix: "grid1", start: start, - totalSize: pagination.totalCount, + totalSize: pagination.totalSize, fetchSize: $$Control._paginationInfo.fetchSize, func: "$$$Control.load({index})", }); diff --git a/src/main/webapp/resources/js/fims/biz/common/popupPageNavigation.js b/src/main/webapp/resources/js/fims/biz/common/popupPageNavigation.js index 7fb78b32..295f4dc4 100644 --- a/src/main/webapp/resources/js/fims/biz/common/popupPageNavigation.js +++ b/src/main/webapp/resources/js/fims/biz/common/popupPageNavigation.js @@ -18,7 +18,7 @@ class PageNavigation { // 페이지당 갯수 ,fetchSize: null // 전체 데이타 count - ,totalCount: null + ,totalSize: null // 페이지 이동 구분 ,pageMove: null }; @@ -33,17 +33,17 @@ class PageNavigation { let pageInfo = { pageNum: 1, fetchSize: null, - totalCount: null + totalSize: null }; if(GRID.paginationInfoRef.paging === true){ - const {pageNum, fetchSize, totalCount} = GRID.paginationInfoRef; + const {pageNum, fetchSize, totalSize} = GRID.paginationInfoRef; pageInfo.pageNum = pageNum; pageInfo.fetchSize = fetchSize; - pageInfo.totalCount = totalCount; + pageInfo.totalSize = totalSize; }else{ - pageInfo.fetchSize = GRID.paginationInfoRef.totalCount; - pageInfo.totalCount = GRID.paginationInfoRef.totalCount; + pageInfo.fetchSize = GRID.paginationInfoRef.totalSize; + pageInfo.totalSize = GRID.paginationInfoRef.totalSize; } this.gridInfo = { @@ -54,7 +54,7 @@ class PageNavigation { ,curRowPos: (pageInfo.pageNum - 1) * pageInfo.fetchSize + gridDataPos + 1 ,pageNum: pageInfo.pageNum ,fetchSize: pageInfo.fetchSize - ,totalCount: pageInfo.totalCount + ,totalSize: pageInfo.totalSize ,pageMove: null ,next: null } @@ -88,12 +88,12 @@ class PageNavigation { }else{ prevObj.attr('disabled', false); } - if(this.gridInfo.curRowPos === this.gridInfo.totalCount){ + if(this.gridInfo.curRowPos === this.gridInfo.totalSize){ nextObj.attr('disabled', true); }else{ nextObj.attr('disabled', false); } - totObj.text(this.gridInfo.curRowPos + " / " + this.gridInfo.totalCount); + totObj.text(this.gridInfo.curRowPos + " / " + this.gridInfo.totalSize); } /** diff --git a/src/main/webapp/resources/js/fims/framework/cmm/cmmUtil.js b/src/main/webapp/resources/js/fims/framework/cmm/cmmUtil.js index 27f64697..f5f6c83d 100644 --- a/src/main/webapp/resources/js/fims/framework/cmm/cmmUtil.js +++ b/src/main/webapp/resources/js/fims/framework/cmm/cmmUtil.js @@ -588,7 +588,7 @@ class FimsDatasetControl extends DatasetControl { totalCountSetting(obj){ if(document.getElementById('totCnt')){ if(obj.data.pagination){ // 부분 조회 - $('#totCnt span').text(obj.data.pagination.totalCount); + $('#totCnt span').text(obj.data.pagination.totalSize); }else{ // 전체 $('#totCnt span').text(obj.count) }