From 90efb7df57794df97a9a211148718c9ab7b5d37a Mon Sep 17 00:00:00 2001 From: leebj Date: Mon, 26 Aug 2024 10:11:10 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cokr/xit/fims/base/web/FileController.java | 2 +- src/main/java/cokr/xit/fims/base/web/OgdpController.java | 6 +++--- src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java | 2 +- src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java | 2 +- src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java | 2 +- src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java | 4 ++-- src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java | 2 +- src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java | 4 ++-- src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java | 2 +- src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java | 2 +- src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java | 2 +- src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java | 2 +- src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java | 2 +- src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java | 2 +- src/main/java/cokr/xit/fims/mngt/web/Mngt01Controller.java | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/cokr/xit/fims/base/web/FileController.java b/src/main/java/cokr/xit/fims/base/web/FileController.java index a4c5f64b..af073d0e 100644 --- a/src/main/java/cokr/xit/fims/base/web/FileController.java +++ b/src/main/java/cokr/xit/fims/base/web/FileController.java @@ -104,7 +104,7 @@ public class FileController extends cokr.xit.base.file.web.FileController { } } - mav = setCollectionInfo(mav, fileInfoList, "file"); + mav = setPagingInfo(mav, fileInfoList, "file"); //민원 동영상파일 첨부 여부 String cvlcptVideoExistYn = "N"; diff --git a/src/main/java/cokr/xit/fims/base/web/OgdpController.java b/src/main/java/cokr/xit/fims/base/web/OgdpController.java index a0a79702..3ab2f5ef 100644 --- a/src/main/java/cokr/xit/fims/base/web/OgdpController.java +++ b/src/main/java/cokr/xit/fims/base/web/OgdpController.java @@ -128,7 +128,7 @@ public class OgdpController extends ApplicationController { public ModelAndView getTasks(CmmnQuery req) { List result = taskBean.getTasks(req); - return setCollectionInfo(new ModelAndView("jsonView"), result, "task"); + return setPagingInfo(new ModelAndView("jsonView"), result, "task"); } /**지정하는 시군구와 업무의 위반 설정 정보를 가져온다.
@@ -137,7 +137,7 @@ public class OgdpController extends ApplicationController { @RequestMapping(name="위반정보 조회", value=METHOD_URL.getVltns) public ModelAndView getVltns(VltnQuery req) { List result = vltnBean.getVltns(req); - return setCollectionInfo(new ModelAndView("jsonView"), result, "vltn"); + return setPagingInfo(new ModelAndView("jsonView"), result, "vltn"); } /**시군구 설정 정보를 수정한다. @@ -271,7 +271,7 @@ public class OgdpController extends ApplicationController { setFetchSize(query); - return setCollectionInfo(new ModelAndView("jsonView"), ogdpBean.getDeptStngList(query),"",""); + return setPagingInfo(new ModelAndView("jsonView"), ogdpBean.getDeptStngList(query),""); } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java index 39ec87de..c7bf7907 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java @@ -87,7 +87,7 @@ public class Crdn01Controller extends ApplicationController { String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); List list = crdnStngService.getLinkFileLayoutMetadataList(query); - return setCollectionInfo(mav, list,"",""); + return setPagingInfo(mav, list,""); } /**장비단속 레이아웃 상세정보를 조회한다.
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java index 2c0cd57f..5edd0c6a 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java @@ -143,7 +143,7 @@ public class Crdn02Controller extends ApplicationController { .addObject("downloadData", list).addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); } - return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),"",""); + return setPagingInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),""); } /**2시간 초과처리 팝업을 호출한다.
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java index d3911427..50572025 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java @@ -114,7 +114,7 @@ public class Crdn03Controller extends ApplicationController { .addObject("downloadData", list).addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); } - return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),"",""); + return setPagingInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),""); } /**표지정보 미확인 자료를 수정한다. diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java index 2e91d270..a2b62b64 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -133,7 +133,7 @@ public class Crdn05Controller extends ApplicationController { String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); - return setCollectionInfo(new ModelAndView("jsonView"),crdnService.getCrackdownList(query),"",""); + return setPagingInfo(new ModelAndView("jsonView"),crdnService.getCrackdownList(query),""); } /**단속자료 파일 등록 팝업화면을 반환한다. @@ -321,7 +321,7 @@ public class Crdn05Controller extends ApplicationController { } } - mav = setCollectionInfo(mav, allParsedDataList,"",""); + mav = setPagingInfo(mav, allParsedDataList,""); return mav; } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java index 586247b2..2108a2f2 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -177,7 +177,7 @@ public class Crdn06Controller extends ApplicationController { return mav; } - return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),"",""); + return setPagingInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),""); } /**지정한 단속 ID에 해당하는 단속 대장를 제거한다. diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java index 7298fea8..26c34f9d 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java @@ -82,7 +82,7 @@ public class Crdn07Controller extends ApplicationController { FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); - return setCollectionInfo(mav, crdnStngService.getTeamList(query),"",""); + return setPagingInfo(mav, crdnStngService.getTeamList(query),""); } /**비사용 단속팀 목록을 조회한다.
@@ -99,7 +99,7 @@ public class Crdn07Controller extends ApplicationController { String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); - return setCollectionInfo(mav, crdnStngService.getRemovedTeamList(query),"",""); + return setPagingInfo(mav, crdnStngService.getRemovedTeamList(query),""); } /** 단속팀 정보를 삭제한다. diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java index 483c594d..11250f8b 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java @@ -120,7 +120,7 @@ public class Crdn08Controller extends ApplicationController { } setFetchSize(query); - return setCollectionInfo(new ModelAndView("jsonView"), crdnStngService.getExemptionVehicleList(query),"",""); + return setPagingInfo(new ModelAndView("jsonView"), crdnStngService.getExemptionVehicleList(query),""); } /**면제차량 상세조회 팝업 화면을 연다.
diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java index d17a3bae..42e0b48f 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java @@ -164,7 +164,7 @@ public class Cvlc01Controller extends ApplicationController { return mav; } - return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getCivilComplaintList(query),"",""); + return setPagingInfo(new ModelAndView("jsonView"), crdnCvlcptService.getCivilComplaintList(query),""); } /**지정한 민원자료를 제거한다. diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java index 8595edd6..1fb030ab 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java @@ -167,7 +167,7 @@ public class Cvlc02Controller extends ApplicationController { return mav; } - return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getCivilComplaintList(query),"",""); + return setPagingInfo(new ModelAndView("jsonView"), crdnCvlcptService.getCivilComplaintList(query),""); } /** 민원답변내용 미리보기 화면을 연다. diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java index 67894004..f3cf3c60 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java @@ -127,6 +127,6 @@ public class Cvlc03Controller extends ApplicationController { return mav.addObject("downloadData", list).addObject("dataNames", cellDefs.stream().map(CellDef::getLabel).toList()); } - return setCollectionInfo(new ModelAndView("jsonView"),crdnCvlcptService.getCivilComplaintList(query),"",""); + return setPagingInfo(new ModelAndView("jsonView"),crdnCvlcptService.getCivilComplaintList(query),""); } } diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java index ea110ef8..9862df23 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java @@ -79,7 +79,7 @@ public class Cvlc04Controller extends ApplicationController { query.setSggCd(currentUser.getOrgID()); setFetchSize(query); - return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getDmndDataList(query),"",""); + return setPagingInfo(new ModelAndView("jsonView"), crdnCvlcptService.getDmndDataList(query),""); } diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java index 1a9a84cd..af43d4c2 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java @@ -71,7 +71,7 @@ public class Cvlc06Controller extends ApplicationController { FimsUser currentUser = (FimsUser) currentUser().getUser(); String currentSggCd = currentUser.getOrgID(); crdnQuery.setSggCd(currentSggCd); - return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getWarningWordsList(crdnQuery),"",""); + return setPagingInfo(new ModelAndView("jsonView"), crdnCvlcptService.getWarningWordsList(crdnQuery),""); } /** 계도문 문구 설정을 저장한다. diff --git a/src/main/java/cokr/xit/fims/mngt/web/Mngt01Controller.java b/src/main/java/cokr/xit/fims/mngt/web/Mngt01Controller.java index a11284b5..e0efd851 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt01Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt01Controller.java @@ -77,7 +77,7 @@ public class Mngt01Controller extends ApplicationController { String sggCd = currentUser.getOrgID(); req.setSggCd(sggCd); List list = ntcService.getNtcList(req); - return setCollectionInfo(mav, list, "", ""); + return setPagingInfo(mav, list, ""); } /**공지사항 상세 내용을 조회하여 반환한다.