From dec3c1780de57f248f08fe4b009341e5d640e68a Mon Sep 17 00:00:00 2001 From: jjh Date: Wed, 14 Feb 2024 15:07:27 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=EA=B3=BC=ED=83=9C=EB=A3=8C=20=EA=B0=90?= =?UTF-8?q?=EA=B2=BD=20=EA=B4=80=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 --- .../xit/fims/excl/web/Excl02Controller.java | 5 +- .../xit/fims/levy/service/bean/LevyBean.java | 2 +- .../xit/fims/levy/web/Levy02Controller.java | 8 +- .../sql/mapper/fims/levy/levy-mapper.xml | 20 ++--- .../sql/mapper/fims/levy/rduct-mapper.xml | 46 ++++++----- .../WEB-INF/jsp/fims/excl/excl01010-main.jsp | 2 +- .../WEB-INF/jsp/fims/excl/excl02010-main.jsp | 2 +- .../WEB-INF/jsp/fims/excl/excl03010-main.jsp | 4 +- .../WEB-INF/jsp/fims/levy/levy01010-main.jsp | 2 +- .../WEB-INF/jsp/fims/levy/levy01050-main.jsp | 16 ++-- .../WEB-INF/jsp/fims/levy/levy02010-main.jsp | 79 +++++++++---------- .../WEB-INF/jsp/fims/levy/levy02020-info.jsp | 7 +- .../WEB-INF/jsp/fims/rdca/rdca01010-main.jsp | 4 +- .../WEB-INF/jsp/fims/sprt/sprt02050-info.jsp | 4 +- 14 files changed, 98 insertions(+), 103 deletions(-) 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 3074fcdc..5f21e5cb 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -285,7 +285,8 @@ public class Excl02Controller extends ApplicationController { * } */ public ModelAndView getOpinionSubmissionAnswerInfo(LevyExclQuery req) { - DataObject opnnSbmsnInfo = opnnSbmsnService.getOpnnSbmsnInfo(req); + // + DataObject info = opnnSbmsnService.getOpnnSbmsnInfo(req); boolean json = jsonResponse(); @@ -302,7 +303,7 @@ public class Excl02Controller extends ApplicationController { .addObject("FIM033List", commonCodes.get("FIM033")) // 의견 제출 구분 코드(OPNN_SBMSN_SE_CD) .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("opnnSbmsnInfo", json ? opnnSbmsnInfo : toJson(opnnSbmsnInfo)) + .addObject("opnnSbmsnInfo", json ? info : toJson(info)) ; } diff --git a/src/main/java/cokr/xit/fims/levy/service/bean/LevyBean.java b/src/main/java/cokr/xit/fims/levy/service/bean/LevyBean.java index 32026de8..b5341b04 100644 --- a/src/main/java/cokr/xit/fims/levy/service/bean/LevyBean.java +++ b/src/main/java/cokr/xit/fims/levy/service/bean/LevyBean.java @@ -232,7 +232,7 @@ public class LevyBean extends AbstractComponent { levy.setRdcamtAdamt(0); // 감액 가산금 levy.setTxtnThing(crdnInfo.string("VHRNO")); // 과세 물건 levy.setMngItem1(crdnInfo.string("CRDN_YMD_TM_MASK")); // 관리 아이템1 - 위반일시 - levy.setMngItem2(crdnInfo.string("CRDN_PLC")); // 관리 아이템2 - 장소 + levy.setMngItem2(crdnInfo.string("CRDN_STDG_NM") + " " + crdnInfo.string("CRDN_PLC")); // 관리 아이템2 - 장소 levy.setMngItem3(crdnInfo.string("VLTN_LAW_NM") + " " + crdnInfo.string("VLTN_LAW1") + " " + crdnInfo.string("VLTN_LAW2")); // 관리 아이템3 - 법령 levy.setMngItem4(crdnInfo.string("VLTN_ARTCL")); // 관리 아이템4 - 위반항목 levy.setMngItem5(""); // 관리 아이템5 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 afc2b2b1..14942f87 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java @@ -169,14 +169,14 @@ public class Levy02Controller extends ApplicationController { */ public ModelAndView getRductInfo(LevyQuery req) { // - DataObject rductInfo = rductService.getRductInfo(req); + DataObject info = rductService.getRductInfo(req); // 등록을 호출하였지만 등록된 감경 ID가 있는지 확인. - if (req.getCallPurpose().equals("create") && !rductInfo.string("RDUCT_ID").equals("")) { + if (req.getCallPurpose().equals("create") && !info.string("RDUCT_ID").equals("")) { ModelAndView mav = new ModelAndView("jsonView"); return mav.addObject("rtnMsg", "이미 등록된 과태료 감경 정보가 있습니다."); - } else if (req.getCallPurpose().equals("create") && rductInfo.string("RTPYR_ID").equals("")) { + } else if (req.getCallPurpose().equals("create") && info.string("RTPYR_ID").equals("")) { ModelAndView mav = new ModelAndView("jsonView"); return mav.addObject("rtnMsg", "납부자 정보가 없습니다."); @@ -192,7 +192,7 @@ public class Levy02Controller extends ApplicationController { .addObject("pageName", "levy02020") .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 .addObject("FIM019List", commonCodes.get("FIM019")) // 감경 사유 구분 코드(RDUCT_RSN_CD) - .addObject("rductInfo", json ? rductInfo : toJson(rductInfo)) + .addObject("rductInfo", json ? info : toJson(info)) ; } } diff --git a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml index 1d2308cd..677eed40 100644 --- a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml +++ b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml @@ -967,20 +967,20 @@ /* 단속 대장 객체 가져오기(rductMapper.selectCrdn) */ @@ -335,16 +335,14 @@ LEFT OUTER JOIN TB_RDUCT R ON (C.CRDN_ID = R.CRDN_ID AND R.DEL_YN = 'N') - AND R.RDUCT_ID = #{rductId} - - AND R.DEL_YN = #{delYN} - + AND R.RDUCT_ID = #{rductId} + + + AND R.DEL_YN = #{delYN} - AND C.CRDN_ID = #{crdnId} - - AND C.DEL_YN = #{delYN} - + AND C.CRDN_ID = #{crdnId} + AND C.DEL_YN = 'N' diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp index 5b1762e3..5d4bb9d9 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp @@ -201,7 +201,7 @@ 단속장소 상세단속장소 위반항목 - 단속금액 + 단속원금 처리상태 단속특별구역 사용연료 diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp index 0d1d0878..03660874 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp @@ -239,7 +239,7 @@ 단속장소 상세단속장소 위반항목 - 단속금액 + 단속원금 과태료금액 처리상태 단속특별구역 diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp index 1981423d..c6bec683 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp @@ -180,7 +180,7 @@ 단속장소 상세단속장소 위반항목 - 단속금액 + 단속원금 처리상태 단속특별구역 사용연료 @@ -609,7 +609,7 @@ colsOuterHTML += this.outerHTML; }); $("#table-responsive--${pageName}")[0].changeColumn(colsOuterHTML); - + // URL 설정 $P.setURL(taskSeCd); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp index 01dc4611..d934a824 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp @@ -210,7 +210,7 @@ 법정동 단속장소 위반항목 - 단속금액 + 단속원금 과태료금액 처리상태 민원접수일자 diff --git a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01050-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01050-main.jsp index b4f5893b..87ec661f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01050-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01050-main.jsp @@ -224,7 +224,6 @@ 과태료금액 부과본세 부과가산금 - 분납이자 수납본세 수납가산금 감액본세 @@ -245,7 +244,7 @@ 법정동 단속장소 위반항목 - 최초금액 + 단속원금 처리상태 납부자구분 납부자번호 @@ -279,7 +278,6 @@ {FFNLG_AMT} {LEVY_PCPTAX} {LEVY_ADAMT} - {INSPY_INT} {RCVMT_PCPTAX} {RCVMT_ADAMT} {RDCAMT_PCPTAX} @@ -317,19 +315,19 @@ @@ -733,7 +731,7 @@ colsOuterHTML += this.outerHTML; }); $("#table-responsive--${pageName}")[0].changeColumn(colsOuterHTML); - + // URL 설정 $P.setURL(taskSeCd); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp index 39c22042..76d0ce1a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp @@ -138,7 +138,6 @@ -
@@ -167,7 +166,7 @@ 단속법정동 단속장소 상세단속장소 - 단속금액 + 단속원금 감경금액 과태료금액 미납금액 @@ -183,32 +182,32 @@ @@ -270,12 +269,12 @@ , dataGetter : obj => obj.${infoPrefix}List , appendData : true , formats: { - RDUCT_YMD : dateFormat, - CRDN_YMD_TM : datetimeFormat, + RDUCT_YMD : dateFormat, + CRDN_YMD_TM : datetimeFormat, FFNLG_CRDN_AMT : numberFormat, - RDUCT_AMT : numberFormat, - FFNLG_AMT : numberFormat, - SUM_AMT : numberFormat + RDUCT_AMT : numberFormat, + FFNLG_AMT : numberFormat, + SUM_AMT : numberFormat } }); $P.control.defaultFetchSize = FETCH_XS; @@ -321,7 +320,7 @@ }); // 삭제 버튼 - $("#btnRemove--${pageName}").prop("disabled", keys.length < 1); + $("#btnRemoveRduct--${pageName}").prop("disabled", keys.length < 1); // DataTables(그리드) 전체 선택(checkbox) if (keys.length < 1) { @@ -354,7 +353,7 @@ // 삭제 callback $P.control.onRemove = (resp) => { - let btnTitle = $("#btnRemove--${pageName}").attr("title"); + let btnTitle = $("#btnRemoveRduct--${pageName}").attr("title"); let showMessage = resp.rtnMsg.replace(/[S]|[F]/g, btnTitle); // 메시지 출력 @@ -489,7 +488,7 @@ $P.callbackRsn = (obj) => { // 서버에 전송할 data(파라미터) 생성 let params = {}; - params[$P.control.prefixed("IDs")] = selected.join(","); // IDs + params[$P.control.prefixed("Ids")] = selected.join(","); // Ids params.delRsn = obj.reason; // 삭제 사유 $P.control.remove(params); @@ -559,15 +558,15 @@ } // 감경 수정 버튼 이벤트 - $P.fnUpdateRduct = () => { + $P.fnUpdateRduct = (title) => { // 감경 ID let rductId = $P.control.dataset.getValue("RDUCT_ID"); // 감경 ID 가 없다면.. return if (typeof rductId == "undefined" || rductId == null || rductId == "") return; let params = { - title : title - , callPurpose : "update" + callPurpose : "update" + , title : title , sggCd : $P.control.dataset.getValue("SGG_CD") // 시군구 코드 , taskSeCd : $P.control.dataset.getValue("TASK_SE_CD") // 업무 구분 코드 , rductId : rductId // 감경 ID @@ -577,7 +576,7 @@ } // 감경 삭제 버튼 이벤트 - $P.fnRemoveRduct = () => { + $P.fnRemoveRduct = (title) => { // 선택 자료 let selected = $P.control.dataset.getKeys("selected"); @@ -712,7 +711,7 @@ colsOuterHTML += this.outerHTML; }); $("#table-responsive--${pageName}")[0].changeColumn(colsOuterHTML); - + // URL 설정 $P.setURL(taskSeCd); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/levy/levy02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/levy/levy02020-info.jsp index 19b03ef3..b4442863 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/levy/levy02020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/levy/levy02020-info.jsp @@ -15,6 +15,7 @@ +
@@ -29,7 +30,7 @@
- + * %
@@ -133,6 +134,7 @@ let dialogTitle = $("#" + $P.control.prefix + "Dialog").find("h5.modal-title").html(); let showMessage = resp.rtnMsg.replace(/[S]|[F]/g, dialogTitle); + // 메시지 출력 dialog.alert({ content : showMessage , onOK : () => { } @@ -170,9 +172,6 @@ // validate 확인 if (!customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; - // 버튼 title - let btnTitle = $("#btnSave--${pageName}").attr("title"); - // 감경 사유 let rductRsnCd = $("#rductRsnCd--${pageName} option:selected").val(); let rductRsnNm = $("#rductRsnCd--${pageName} option:selected").text(); diff --git a/src/main/webapp/WEB-INF/jsp/fims/rdca/rdca01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/rdca/rdca01010-main.jsp index ace36d98..0f5cbf21 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/rdca/rdca01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/rdca/rdca01010-main.jsp @@ -214,7 +214,7 @@ 단속장소 상세단속장소 위반항목 - 단속금액 + 단속원금 처리상태 단속특별구역 사용연료 @@ -762,7 +762,7 @@ colsOuterHTML += this.outerHTML; }); $("#table-responsive--${pageName}")[0].changeColumn(colsOuterHTML); - + // URL 설정 $P.setURL(taskSeCd); } 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 b35e89af..789e1705 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 @@ -369,7 +369,7 @@ } else { dialog.open({ id : $P.rductControl.prefixed("Dialog") - , title : params.btnTitle + , title : params.title , content : resp , size : "lg" , onClose : () => { $P.refreshDataInfo(); } @@ -392,7 +392,7 @@ // 자료 재조회 if (resp.saved) { - $P.refreshDataInfo(); // 자료 재조회 + $P.refreshDataInfo(); } }