From 11c68e53c594752931dc77df0cc9fa5d873e3c4d Mon Sep 17 00:00:00 2001 From: jjh Date: Wed, 13 Dec 2023 18:18:53 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/excl/web/Excl01Controller.java | 2 -- .../xit/fims/excl/web/Excl02Controller.java | 6 +---- .../xit/fims/levy/web/Levy02Controller.java | 10 ++----- .../sql/mapper/fims/levy/rduct-mapper.xml | 1 + .../WEB-INF/jsp/fims/sprt/sprt02050-info.jsp | 27 ++++++++++--------- 5 files changed, 18 insertions(+), 28 deletions(-) diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java index 7d659c1a..7a8761ae 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java @@ -145,7 +145,6 @@ public class Excl01Controller extends ApplicationController { return mav .addObject("message", "이미 등록된 부과제외 정보가 있습니다.") - .addObject("rtnScs", false) .addObject("rtnMsg", "이미 등록된 부과제외 정보가 있습니다.") ; } else { @@ -161,7 +160,6 @@ public class Excl01Controller extends ApplicationController { return mav .addObject("saveCallbackFuncName", saveCallbackFuncName) // .addObject("savedCallbackFuncName", savedCallbackFuncName) // - .addObject("rtnScs", true) .addObject("pageName", "excl01020") // .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 .addObject("FIM021List", commonCodes.get("FIM021")) // 부과 제외 구분 코드(LEVY_EXCL_SE_CD) diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java index d31207bc..67bcc5eb 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -114,10 +114,7 @@ public class Excl02Controller extends ApplicationController { if (req.getCallPurpose().equals("create") && !opnnSbmsnInfo.string("OPNN_ID").equals("")) { ModelAndView mav = new ModelAndView("jsonView"); - return mav - .addObject("rtnScs", false) - .addObject("rtnMsg", "이미 등록된 의견제출 정보가 있습니다.") - ; + return mav.addObject("rtnMsg", "이미 등록된 의견제출 정보가 있습니다."); } else { boolean json = jsonResponse(); @@ -127,7 +124,6 @@ public class Excl02Controller extends ApplicationController { Map> commonCodes = getCodesOf("FIM019", "FIM029", "FIM030", "FIM032", "FIM033", "FIM054"); return mav - .addObject("rtnScs", true) .addObject("pageName", "excl02020") .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 .addObject("FIM029List", commonCodes.get("FIM029")) // 접수 구분 코드(RCPT_SE_CD) 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 e60c42e0..9b85e2dc 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java @@ -112,16 +112,11 @@ public class Levy02Controller extends ApplicationController { if (req.getCallPurpose().equals("create") && !rductInfo.string("RDUCT_ID").equals("")) { ModelAndView mav = new ModelAndView("jsonView"); - return mav - .addObject("rtnScs", false) - .addObject("rtnMsg", "이미 등록된 과태료 감경 정보가 있습니다.") - ; + return mav.addObject("rtnMsg", "이미 등록된 과태료 감경 정보가 있습니다."); } else if (req.getCallPurpose().equals("create") && rductInfo.string("RTPYR_ID").equals("")) { ModelAndView mav = new ModelAndView("jsonView"); - return mav - .addObject("rtnScs", false) - .addObject("rtnMsg", "납부자 정보가 없습니다."); + return mav.addObject("rtnMsg", "납부자 정보가 없습니다."); } else { boolean json = jsonResponse(); @@ -131,7 +126,6 @@ public class Levy02Controller extends ApplicationController { Map> commonCodes = getCodesOf("FIM019"); return mav - .addObject("rtnScs", true) .addObject("pageName", "levy02020") .addObject("FIM019List", commonCodes.get("FIM019")) // 감경 사유 구분 코드(RDUCT_RSN_CD) .addObject("rductInfo", json ? rductInfo : toJson(rductInfo)) diff --git a/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml b/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml index 0dd5ffcf..3b7c8876 100644 --- a/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml +++ b/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml @@ -180,6 +180,7 @@ AND R.RDUCT_ID = #{rductId} /* 감경 ID */ + diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp index 8a0195a2..a44e0f61 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp @@ -344,7 +344,12 @@ url : wctx.url(params.taskSeCd + ${pageName}${pageDataName1}PrefixUrl + "/020/info.do") , data : params || {} , success : resp => { - if (resp.rtnScs) { // 성공 + if ((typeof resp) != "string") { + if (resp.rtnMsg != "") { + dialog.alert(resp.rtnMsg); + } + return; + } else { dialog.open({ id : ${pageName}${pageDataName1}Control.prefixed("Dialog") , title : dialogTitle @@ -352,10 +357,6 @@ , size : "lg" , onClose : () => { refreshDataInfo${pageName}(); } // callback 자료 재조회 }); - } else { // 실패 - if (resp.rtnMsg != "") { - dialog.alert(resp.rtnMsg); - } } } }); @@ -389,15 +390,15 @@ dialog.alert(resp.rtnMsg); } return; + } else { + dialog.open({ + id : ${pageName}${pageDataName2}Control.prefixed("Dialog") + , title : dialogTitle + , content : resp + , size : "md" + , onClose : () => { refreshDataInfo${pageName}(); } // callback 자료 재조회 + }); } - - dialog.open({ - id : ${pageName}${pageDataName2}Control.prefixed("Dialog") - , title : dialogTitle - , content : resp - , size : "md" - , onClose : () => { refreshDataInfo${pageName}(); } // callback 자료 재조회 - }); } }); }