From 17ce26ccab927ff6f5854760b679b0731ea33543 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Thu, 25 Jan 2024 16:21:52 +0900 Subject: [PATCH] =?UTF-8?q?pageName=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/cmmn/CmmnQuery.java | 23 +------------------ .../xit/fims/crdn/web/Crdn02Controller.java | 4 ++-- .../xit/fims/crdn/web/Crdn03Controller.java | 2 +- .../xit/fims/crdn/web/Crdn05Controller.java | 6 ++--- .../xit/fims/crdn/web/Crdn06Controller.java | 3 ++- .../xit/fims/crdn/web/Crdn07Controller.java | 2 +- .../xit/fims/crdn/web/Crdn08Controller.java | 2 +- .../xit/fims/cvlc/web/Cvlc01Controller.java | 4 ++-- .../xit/fims/cvlc/web/Cvlc02Controller.java | 4 ++-- .../xit/fims/cvlc/web/Cvlc03Controller.java | 2 +- .../xit/fims/cvlc/web/Cvlc04Controller.java | 2 +- .../xit/fims/cvlc/web/Cvlc05Controller.java | 2 +- .../xit/fims/cvlc/web/Cvlc06Controller.java | 2 +- .../xit/fims/levy/web/Levy02Controller.java | 2 +- .../xit/fims/mngt/web/Mngt01Controller.java | 2 +- .../xit/fims/mngt/web/Mngt02Controller.java | 2 +- .../xit/fims/mngt/web/Mngt03Controller.java | 6 ++--- .../xit/fims/mngt/web/Mngt04Controller.java | 2 +- .../xit/fims/sprt/web/Sprt01Controller.java | 14 +++++------ .../xit/fims/stat/web/Stat01Controller.java | 10 ++++---- .../WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp | 2 +- .../WEB-INF/jsp/fims/sprt/sprt03010-main.jsp | 2 +- 22 files changed, 40 insertions(+), 60 deletions(-) diff --git a/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java b/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java index 1ea9d147..71a97836 100644 --- a/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java +++ b/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java @@ -11,14 +11,11 @@ public class CmmnQuery extends QueryRequest { private String cellDefs; - private String[] excelTitle; - private int[] excelTitleWidth; - private String thisDay; + private String taskSeCd; // 업무 구분 코드 private String sggCd; // 시군구 코드 private String deptCd; // 부서 코드 - private String taskSeCd; // 업무 구분 코드 private String instCd; // 기관 코드 private String useYN; // 사용 여부 private String delYN; // 삭제 여부 @@ -60,24 +57,6 @@ public class CmmnQuery extends QueryRequest { return self(); } - public String[] getExcelTitle() { - return ifEmpty(excelTitle, () -> null); - } - - public T setExcelTitle(String[] excelTitle) { - this.excelTitle = excelTitle; - return self(); - } - - public int[] getExcelTitleWidth() { - return ifEmpty(excelTitleWidth, () -> null); - } - - public T setExcelTitleWidth(int[] excelTitleWidth) { - this.excelTitleWidth = excelTitleWidth; - return self(); - } - public String getThisDay() { return ifEmpty(thisDay, () -> null); } 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 36ebce35..b99950a0 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java @@ -69,7 +69,7 @@ public class Crdn02Controller extends ApplicationController { public ModelAndView crackdownDataInspectionMain() { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/crdn/crdn02010-main"); - mav.addObject("pageName", "crdn02010-main"); + mav.addObject("pageName", "crdn02010"); mav.addObject("module", "type='module'"); Map> commonCodes = getCodesOf("FIM002", "FIM003", "FIM010", "FIM026","FIM054"); @@ -158,7 +158,7 @@ public class Crdn02Controller extends ApplicationController { public ModelAndView getOverTimeInfo(String openerPageName, String savedCallbackFuncName, String crdnId) { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/crdn/crdn02050-info"); - mav.addObject("pageName","crdn02050-info"); + mav.addObject("pageName","crdn02050"); DataObject crdnInfo = crdnInfoMapper.selectCrdnInfo(crdnId); 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 14b55aae..5ae3e99d 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java @@ -61,7 +61,7 @@ public class Crdn03Controller extends ApplicationController { public ModelAndView tagInformationUndefinedDataMain() { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/crdn/crdn03010-main"); - mav.addObject("pageName","crdn03010-main"); + mav.addObject("pageName","crdn03010"); Map> commonCodes = getCodesOf("FIM003", "FIM010"); addCodes(commonCodes, mav, "FIM003", "FIM010"); 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 0bd5321f..2d58d55a 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -102,7 +102,7 @@ public class Crdn05Controller extends ApplicationController { public ModelAndView crackdownDataRegistrationMain() { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/crdn/crdn05010-main"); - mav.addObject("pageName", "crdn05010-main"); + mav.addObject("pageName", "crdn05010"); Map> commonCodes = getCodesOf("FIM003", "FIM026", "FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); @@ -135,7 +135,7 @@ public class Crdn05Controller extends ApplicationController { */ public ModelAndView getFileRegistrationScreen(HttpServletRequest hReq) { ModelAndView mav = new ModelAndView("fims/crdn/crdn05020-info"); - mav.addObject("pageName", "crdn05020-info"); + mav.addObject("pageName", "crdn05020"); String urlTaskSeCd = hReq.getServletPath().split("/")[1]; mav.addObject("taskSeCd", urlTaskSeCd); @@ -391,7 +391,7 @@ public class Crdn05Controller extends ApplicationController { public ModelAndView getManualRegistrationScreen(HttpServletRequest hReq) { ModelAndView mav = new ModelAndView("fims/crdn/crdn05030-info"); - mav.addObject("pageName", "crdn05030-info"); + mav.addObject("pageName", "crdn05030"); String urlTaskSeCd = hReq.getServletPath().split("/")[1]; mav.addObject("taskSeCd", urlTaskSeCd); 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 2df392af..69cecc55 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -68,7 +68,8 @@ public class Crdn06Controller extends ApplicationController { public ModelAndView crackdownManagementMain() { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/crdn/crdn06010-main"); - mav.addObject("pageName", "crdn06010-main"); + + mav.addObject("pageName", "crdn06010"); Map> commonCodes = getCodesOf("FIM002", "FIM003", "FIM005", "FIM010", "FIM022", "FIM026", "FIM034", "FIM054"); 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 ce3f7f5c..912cd94e 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java @@ -54,7 +54,7 @@ public class Crdn07Controller extends ApplicationController { public ModelAndView crackdownTeamManagementMain() { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/crdn/crdn07010-main"); - mav.addObject("pageName", "crdn07010-main"); + mav.addObject("pageName", "crdn07010"); Map> commonCodes = getCodesOf("FIM054","FIM071","FIM002"); mav.addObject("FIM054List", commonCodes.get("FIM054")); 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 2ce38b07..7d41f5dd 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java @@ -61,7 +61,7 @@ public class Crdn08Controller extends ApplicationController { public ModelAndView exemptionVehicleManagementMain() { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/crdn/crdn08010-main"); - mav.addObject("pageName", "crdn08010-main"); + mav.addObject("pageName", "crdn08010"); Map> commonCodes = getCodesOf("NTR034"); addCodes(commonCodes, mav, "NTR034"); 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 4110595b..f42c9f97 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java @@ -74,7 +74,7 @@ public class Cvlc01Controller extends ApplicationController { public ModelAndView civilComplaintReceiptDataMain() { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/cvlc/cvlc01010-main"); - mav.addObject("pageName", "cvlc01010-main"); + mav.addObject("pageName", "cvlc01010"); Map> commonCodes = getCodesOf("FIM026","FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); @@ -172,7 +172,7 @@ public class Cvlc01Controller extends ApplicationController { boolean json = jsonResponse(); ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/cvlc/cvlc01050-info"); - mav.addObject("pageName", "cvlc01050-info"); + mav.addObject("pageName", "cvlc01050"); String urlTaskSeCd = hReq.getServletPath().split("/")[1]; mav.addObject("taskSeCd", urlTaskSeCd); 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 473d1577..2714ae44 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java @@ -69,7 +69,7 @@ public class Cvlc02Controller extends ApplicationController { public ModelAndView civilComplaintAnswerTargetDataMain() { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/cvlc/cvlc02010-main"); - mav.addObject("pageName", "cvlc02010-main"); + mav.addObject("pageName", "cvlc02010"); Map> commonCodes = getCodesOf("FIM017","FIM022", "FIM026", "FIM054"); mav.addObject("FIM017List", commonCodes.get("FIM017")); @@ -150,7 +150,7 @@ public class Cvlc02Controller extends ApplicationController { boolean json = jsonResponse(); ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/cvlc/cvlc02060-info"); - mav.addObject("pageName", "cvlc02060-info"); + mav.addObject("pageName", "cvlc02060"); String urlTaskSeCd = hReq.getServletPath().split("/")[1]; mav.addObject("taskSeCd", urlTaskSeCd); 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 4565a7e5..365318a4 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java @@ -63,7 +63,7 @@ public class Cvlc03Controller extends ApplicationController { public ModelAndView civilComplaintManagementMain() { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/cvlc/cvlc03010-main"); - mav.addObject("pageName", "cvlc03010-main"); + mav.addObject("pageName", "cvlc03010"); Map> commonCodes = getCodesOf("FIM022","FIM026", "FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); 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 a7b8a69e..474f5406 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java @@ -56,7 +56,7 @@ public class Cvlc04Controller extends ApplicationController { public ModelAndView civilComplaintIndividualRegistrationMain() { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/cvlc/cvlc04010-main"); - mav.addObject("pageName", "cvlc04010-main"); + mav.addObject("pageName", "cvlc04010"); Map> commonCodes = getCodesOf("FIM054","FIM063"); mav.addObject("FIM054List", commonCodes.get("FIM054")); diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java index 6dbaa749..2b551be0 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java @@ -55,7 +55,7 @@ public class Cvlc05Controller extends ApplicationController { public ModelAndView cvlcptAnswerWordsManageMain() { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/cvlc/cvlc05010-main"); - mav.addObject("pageName", "cvlc05010-main"); + mav.addObject("pageName", "cvlc05010"); mav.addObject("module", "type='module'"); mav.addObject("currentUserName", UserInfo.current().getName()); 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 23f0383b..87a01515 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java @@ -52,7 +52,7 @@ public class Cvlc06Controller extends ApplicationController { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/cvlc/cvlc06010-main"); - mav.addObject("pageName", "cvlc06010-main"); + mav.addObject("pageName", "cvlc06010"); Map> commonCodes = getCodesOf("FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); diff --git a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java index 3ae841ca..78f6802f 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java @@ -82,7 +82,7 @@ public class Levy02Controller extends ApplicationController { ModelAndView mav = getRductList(new LevyQuery().setPageNum(1)); mav.setViewName("fims/levy/levy02010-main"); - mav.addObject("pageName","levy02010-main"); + mav.addObject("pageName","levy02010"); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM010", "FIM019", "FIM054"); 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 c4789133..b1c55287 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt01Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt01Controller.java @@ -30,7 +30,7 @@ public class Mngt01Controller extends ApplicationController { public ModelAndView ntcMain() { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/mngt/mngt01010-main"); - mav.addObject("pageName", "mngt01010-main"); + mav.addObject("pageName", "mngt01010"); return mav; } diff --git a/src/main/java/cokr/xit/fims/mngt/web/Mngt02Controller.java b/src/main/java/cokr/xit/fims/mngt/web/Mngt02Controller.java index 67f795e8..b8a38612 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt02Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt02Controller.java @@ -30,7 +30,7 @@ public class Mngt02Controller extends ApplicationController { public ModelAndView schdlMain() { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/mngt/mngt02010-main"); - mav.addObject("pageName", "mngt02010-main"); + mav.addObject("pageName", "mngt02010"); return mav; } diff --git a/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java b/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java index d317346e..fccb5863 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java @@ -54,17 +54,17 @@ public class Mngt03Controller extends ApplicationController { if(ifEmpty(sggCd, ()->"").equals("")) { mav.setViewName("fims/mngt/mngt03011-main"); - mav.addObject("pageName", "mngt03011-main"); + mav.addObject("pageName", "mngt03011"); } else { mav.setViewName("fims/mngt/mngt03010-main"); - mav.addObject("pageName", "mngt03010-main"); + mav.addObject("pageName", "mngt03010"); mav.addObject("sggCd", sggCd); } } else { mav.setViewName("fims/mngt/mngt03010-main"); - mav.addObject("pageName", "mngt03010-main"); + mav.addObject("pageName", "mngt03010"); factionBean.initUserInfo(userInfo); mav.addObject("sggCd", userInfo.getInfo().get("sggCd")); } diff --git a/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java b/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java index aa5345d1..68409870 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java @@ -25,7 +25,7 @@ public class Mngt04Controller extends ApplicationController { public ModelAndView deptMngtMain() { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/mngt/mngt04010-main"); - mav.addObject("pageName", "mngt04010-main"); + mav.addObject("pageName", "mngt04010"); return mav; } diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java index a34e7a9f..5a903b06 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -140,7 +140,7 @@ public class Sprt01Controller extends ApplicationController { addCodes(commonCodes, mav, "FIM003", "FIM010", "FIM026", "FIM054" ,"FIM004","FIM005","FIM006","FIM061","FIM064"); - mav.addObject("pageName", "sprt01010-main");// View(jsp)에서 사용할 id 뒤에 붙일 suffix + mav.addObject("pageName", "sprt01010");// View(jsp)에서 사용할 id 뒤에 붙일 suffix String fastBy = req.getParameter("fastBy"); String fastTerm = req.getParameter("fastTerm"); @@ -375,7 +375,7 @@ public class Sprt01Controller extends ApplicationController { */ public ModelAndView inputEtcCnMain(String... crdnIds) { ModelAndView mav = new ModelAndView("fims/sprt/sprt01100-info"); - mav.addObject("pageName", "sprt01100-info"); + mav.addObject("pageName", "sprt01100"); mav.addObject("crdnIds", toJson(crdnIds)); return mav; @@ -407,7 +407,7 @@ public class Sprt01Controller extends ApplicationController { */ public ModelAndView printCrdnMain(String... crdnIds) { ModelAndView mav = new ModelAndView("fims/sprt/sprt01110-info"); - mav.addObject("pageName", "sprt01110-info"); + mav.addObject("pageName", "sprt01110"); mav.addObject("crdnIds", toJson(crdnIds)); return mav; @@ -450,7 +450,7 @@ public class Sprt01Controller extends ApplicationController { */ public ModelAndView printBillMain(String... crdnIds) { ModelAndView mav = new ModelAndView("fims/sprt/sprt01120-info"); - mav.addObject("pageName", "sprt01120-info"); + mav.addObject("pageName", "sprt01120"); mav.addObject("crdnIds", toJson(crdnIds)); return mav; @@ -499,7 +499,7 @@ public class Sprt01Controller extends ApplicationController { */ public ModelAndView printAdvntceMain(String... crdnIds) { ModelAndView mav = new ModelAndView("fims/sprt/sprt01140-info"); - mav.addObject("pageName", "sprt01140-info"); + mav.addObject("pageName", "sprt01140"); mav.addObject("crdnIds", toJson(crdnIds)); return mav; @@ -537,7 +537,7 @@ public class Sprt01Controller extends ApplicationController { */ public ModelAndView printNhtMain(String... crdnIds) { ModelAndView mav = new ModelAndView("fims/sprt/sprt01150-info"); - mav.addObject("pageName", "sprt01150-info"); + mav.addObject("pageName", "sprt01150"); mav.addObject("crdnIds", toJson(crdnIds)); return mav; @@ -572,7 +572,7 @@ public class Sprt01Controller extends ApplicationController { */ public ModelAndView otptStngMain() { ModelAndView mav = new ModelAndView("fims/sprt/sprt01200-main"); - mav.addObject("pageName", "sprt01200-main"); + mav.addObject("pageName", "sprt01200"); Map> commonCodes = getCodesOf("FIM054","FIM047","FIM078","FIM080"); diff --git a/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java b/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java index a3d195f8..9220f479 100644 --- a/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java +++ b/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java @@ -145,7 +145,7 @@ public class Stat01Controller extends ApplicationController { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/stat/stat01010-main"); - mav.addObject("pageName", "stat01010-main"); + mav.addObject("pageName", "stat01010"); ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); String curDeptCode = currentUser.getDeptCode(); @@ -170,7 +170,7 @@ public class Stat01Controller extends ApplicationController { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/stat/stat01020-main"); - mav.addObject("pageName", "stat01020-main"); + mav.addObject("pageName", "stat01020"); ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); String curDeptCode = currentUser.getDeptCode(); @@ -196,7 +196,7 @@ public class Stat01Controller extends ApplicationController { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/stat/stat01030-main"); - mav.addObject("pageName", "stat01030-main"); + mav.addObject("pageName", "stat01030"); ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); String curDeptCode = currentUser.getDeptCode(); @@ -220,7 +220,7 @@ public class Stat01Controller extends ApplicationController { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/stat/stat01040-main"); - mav.addObject("pageName", "stat01040-main"); + mav.addObject("pageName", "stat01040"); ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); String curDeptCode = currentUser.getDeptCode(); @@ -244,7 +244,7 @@ public class Stat01Controller extends ApplicationController { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/stat/stat01050-main"); - mav.addObject("pageName", "stat01050-main"); + mav.addObject("pageName", "stat01050"); ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); String curDeptCode = currentUser.getDeptCode(); diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp index 2b9266df..4a5fb7a4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp @@ -511,7 +511,7 @@ $(document).ready(function(){ var params = { "crdnId" : crdnId, "levyExclSeCd" : levyExclSeCd, - "saveCallbackFuncName" : "pageObject['cvlc01020-info']['exclSaveCallback']", + "saveCallbackFuncName" : "pageObject['${pageName}']['exclSaveCallback']", "callPurpose" : "create" }; diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp index 22358b19..20aee599 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp @@ -204,7 +204,7 @@ $("#btnSave").on("click",function(){ $(document).ready(function(){ - if(openerPageName == "cvlc01020-info"){ + if(openerPageName == "cvlc01020"){ $("#btnLoad").removeClass("d-block"); $("#btnLoad").addClass("d-none");