From 21bed67a7c6a106db683fc38425a3e0032f1e491 Mon Sep 17 00:00:00 2001 From: jjh Date: Wed, 13 Sep 2023 14:00:12 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B0=9C=EB=B3=84=EC=B4=9D=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=20=EC=9D=B4=EC=A0=84,=20=EB=8B=A4=EC=9D=8C=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/sprt/SprtQuery.java | 12 ++ .../xit/fims/sprt/web/Sprt02Controller.java | 3 +- .../sql/mapper/fims/levy/rduct-mapper.xml | 13 +- .../WEB-INF/jsp/fims/excl/excl01010-main.jsp | 7 +- .../WEB-INF/jsp/fims/levy/levy02010-main.jsp | 18 +- .../WEB-INF/jsp/fims/sprt/sprt02010-main.jsp | 157 +++++++++++++++--- 6 files changed, 179 insertions(+), 31 deletions(-) diff --git a/src/main/java/cokr/xit/fims/sprt/SprtQuery.java b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java index af8fe60e..4f316385 100644 --- a/src/main/java/cokr/xit/fims/sprt/SprtQuery.java +++ b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java @@ -6,6 +6,8 @@ public class SprtQuery extends CmmnQuery { private static final long serialVersionUID = 1L; + // 필수 + private String callControlName; // 호출한 페이지의 Control 이름 // ID private String crdnId; // 단속 ID private String levyExclId; // 부과 제외 ID @@ -23,6 +25,16 @@ public class SprtQuery extends CmmnQuery { private String delRsn; // 삭제 사유 private String inquiryCondition; // 조회 조건 + public String getCallControlName() { + return ifEmpty(callControlName, () -> null); + } + + public T setCallControlName(String callControlName) { + this.callControlName = callControlName; + + return self(); + } + public String getCrdnId() { return ifEmpty(crdnId, () -> null); } diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java index 8fd3e01c..0d04e4dc 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java @@ -90,8 +90,9 @@ public class Sprt02Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02010-main"); return mav + .addObject("callControlName", req.getCallControlName()) .addObject("pageName", "sprt02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("pageNameMain", "sprt02010") + .addObject("pageNameMain", "sprt02010") // 개별총정보 메인 화면명 .addObject("totalInfo", json ? totalInfo : toJson(totalInfo)) // 개별총정보 ; } 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 caeb7bfd..9fecb1f1 100644 --- a/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml +++ b/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml @@ -27,8 +27,6 @@ SELECT R.RDUCT_ID /* 감경 ID */ - , R.CRDN_ID /* 단속 ID */ - , R.RTPYR_ID /* 납부자 ID */ , R.RDUCT_YMD /* 감경 일자 */ , R.RDUCT_RSN_CD /* 감경 사유 코드 */ , (SELECT FN_GET_CODE_NM('FIM019', R.RDUCT_RSN_CD) FROM DUAL) AS RDUCT_RSN_NM /* 감경 사유 명 */ @@ -45,20 +43,25 @@ , R.DLTR /* 삭제자 */ , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = R.DLTR) AS DLTR_NM /* 삭제자 명 */ , R.DEL_RSN /* 삭제 사유 */ + , C.CRDN_ID /* 단속 ID */ + , C.SGG_CD /* 시군구 코드 */ + , C.TASK_SE_CD /* 업무 구분 코드 */ , CONCAT(C.CRDN_YMD,C.CRDN_TM) AS CRDN_YMD_TM /* 단속 일시 */ , C.VHRNO /* 차량 번호 */ , C.FFNLG_CRDN_AMT /* 과태료 단속 금액 */ , C.FFNLG_RDUCT_RT /* 과태료 감경 율 */ , C.FFNLG_AMT /* 과태료 금액 */ , C.ADVNTCE_AMT /* 사전통지금액 */ - , C.MINUS_AMT - , C.ADTN_AMT - , C.RCVMT_AMT , C.CRDN_STTS_CD /* 단속 상태 코드 */ , (SELECT FN_GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM /* 단속 상태 명 */ + , P.RTPYR_ID /* 납부자 ID */ , P.RTPYR_NO /* 납부자 번호 */ , P.RTPYR_NM /* 납부자 명 */ , L.LEVY_ID /* 부과 ID */ + , L.LEVY_PCPTAX + LEVY_ADAMT AS LEVY_AMT /* 부과 금액 */ + , L.RCVMT_PCPTAX + RCVMT_ADAMT AS RCVMT_AMT /* 수납 금액 */ + , L.RDCAMT_PCPTAX + RDCAMT_ADAMT AS RDCAMT_AMT /* 감액 금액 */ + , L.SUM_AMT /* 합계 금액 */ FROM TB_RDUCT R INNER JOIN TB_CRDN C ON (R.CRDN_ID = C.CRDN_ID) LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) 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 2b946e43..73794109 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 @@ -349,9 +349,14 @@ return; } + let params = { + callControlName : "${pageName}Control" + , crdnId : crdnId + } + ajax.get({ url : ${pageName}Control.urls.getInfo - , data : { crdnId : crdnId } + , data : params || {} , success : resp => { dialog.open({ id : "totalInfoMainDialog" 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 57f77315..c41deb6f 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 @@ -102,7 +102,8 @@ 차량번호 과태료단속원금 감경금액 - 잔액 + 과태료금액 + 미납금액 감경특기사항 처리상태 @@ -117,14 +118,15 @@ {VHRNO} {FFNLG_CRDN_AMT} {RDUCT_AMT} - {BLNC} + {FFNLG_AMT} + {SUM_AMT} {ETC_CN} {CRDN_STTS_CD} @@ -170,8 +172,9 @@ $(document).ready(function(){ CRDN_YMD_TM : datetimeFormat, FFNLG_CRDN_AMT : numberFormat, RDUCT_AMT : numberFormat, + FFNLG_AMT : numberFormat, CRDN_STTS_CD : FIM010, - BLNC : numberFormat + SUM_AMT : numberFormat } }); $P.rductControl.defaultFetchSize = FETCH_XS; @@ -271,9 +274,14 @@ $(document).ready(function(){ } $P.dblclickRductList = (dataKey) => { + let params = { + callControlName : "pageObject['${pageName}'].rductControl" + , crdnId : dataKey + } + ajax.get({ url : $P.rductControl.urls.getInfo, - data : { "crdnId" : dataKey }, + data : params, success : resp => { dialog.open({ id : "totalInfoMainDialog", diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp index 54fc7435..858eeaeb 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp @@ -32,8 +32,8 @@
- - + +
@@ -43,43 +43,43 @@
    • @@ -106,6 +106,8 @@ var ${pageName}PrefixUrl = "/sprt/sprt02"; // FormFields var ${pageName}Fields = new FormFields("#frmEdit--${pageName}"); + // 자료 이동을 위한 자료의 Index. 0부터 시작. + var curDataIndex; /************************************************************************** * DatasetControl @@ -124,6 +126,9 @@ ${pageName}Control.onCurrentChange = item => { // Dataset 셋팅 ${pageName}Fields.set(item); + + // 건수 표기 + fnChangeCountStauts(); } /************************************************************************** @@ -134,9 +139,9 @@ /************************************************************************** * 초기 셋팅 **************************************************************************/ - // 검색조건 초기값 셋팅 + // 화면 초기값 셋팅 initForm${pageName} = () => { - + curDataIndex = null; // 화면이 열릴때 초기 값으로 null로 설정해야 건수가 정상 표시 된다. } // 이벤트 설정 @@ -147,8 +152,122 @@ /************************************************************************** * function **************************************************************************/ + // 건수 표기 + fnChangeCountStauts = () => { + // curDataIndex 에 값이 없다면.. + if (curDataIndex == null) { + let mainDataItems = ${callControlName}.dataset._items; + let curCrdnId = ${pageName}Control.dataset.getValue("CRDN_ID"); + + for (iLoop = 0; iLoop < mainDataItems.length; iLoop++) { + if (mainDataItems[iLoop].data.CRDN_ID == curCrdnId) { + curDataIndex = iLoop; + break; + } + } + } + + let viewNumber = curDataIndex + 1; + + $("#countStauts--${pageName}").val(viewNumber + " of " + ${callControlName}.dataset._items.length); + } + + // 이전 자료 조회 + fnPrev${pageName} = () => { + let mainDataItems = ${callControlName}.dataset._items; + let curCrdnId = ${pageName}Control.dataset.getValue("CRDN_ID"); + + // 초기 값은 callControl dataset 의 총 건수 - 1 + if (curDataIndex == null) { + curDataIndex = mainDataItems.length - 1; + } + + for (iLoop = curDataIndex; iLoop >= 0; iLoop--) { + if (mainDataItems[iLoop].data.CRDN_ID == curCrdnId) { + if (iLoop - 1 < 0) { return; } // 종료 + + curDataIndex = iLoop - 1; + break; + } + } + + let crdnId = mainDataItems[curDataIndex].data.CRDN_ID; + + // 단속 ID 가 없다면.. return + if (crdnId == null || crdnId == "") { + return; + } + + let params = { + callPurpose : "view" + , callControlName : "${callControlName}" + , crdnId : crdnId + , sggCd : mainDataItems[curDataIndex].data.SGG_CD + , taskSeCd : mainDataItems[curDataIndex].data.TASK_SE_CD + , delYn : "N" + }; + + fnDataRefreshInfo(params); + } + + // 다음 자료 조회 + fnNext${pageName} = () => { + let mainDataItems = ${callControlName}.dataset._items; + let curCrdnId = ${pageName}Control.dataset.getValue("CRDN_ID"); + + // 초기 값은 0 + if (curDataIndex == null) { + curDataIndex = 0; + } + + for (iLoop = curDataIndex; iLoop < mainDataItems.length; iLoop++) { + if (mainDataItems[iLoop].data.CRDN_ID == curCrdnId) { + if (iLoop + 1 >= mainDataItems.length) { return; } // 종료 + + curDataIndex = iLoop + 1; + break; + } + } + + let crdnId = mainDataItems[curDataIndex].data.CRDN_ID; + + // 단속 ID 가 없다면.. return + if (crdnId == null || crdnId == "") { + return; + } + + let params = { + callPurpose : "view" + , callControlName : "${callControlName}" + , crdnId : crdnId + , sggCd : mainDataItems[curDataIndex].data.SGG_CD + , taskSeCd : mainDataItems[curDataIndex].data.TASK_SE_CD + , delYn : "N" + }; + + fnDataRefreshInfo(params); + } + + // 자료 재조회 + fnDataRefreshInfo = (params) => { + ajax.get({ + url : wctx.url("/" + params.taskSeCd + "/sprt/sprt02/010/main.do") + , headers: { Accept: "application/json; charset=utf-8" } // json + , data : params || {} + , success : resp => { + if (resp.totalInfo) { + // 최상단 단속 Data 셋팅 + ${pageName}Control.setData([resp.totalInfo]); + + // 단속 납부자 Data 셋팅 + fnCrdnPayerInfo${pageName}(); + } + } + }); + } + // 단속 정보 - fnBtnCrdnPayerInfo${pageName} = () => { + fnCrdnPayerInfo${pageName} = () => { let crdnId = ${pageName}Control.dataset.getValue("CRDN_ID"); let sggCd = ${pageName}Control.dataset.getValue("SGG_CD"); let taskSeCd = ${pageName}Control.dataset.getValue("TASK_SE_CD"); @@ -176,7 +295,7 @@ } // 의견제출 정보 - fnBtnOpnnSbmsnInfo${pageName} = () => { + fnOpnnSbmsnInfo${pageName} = () => { let crdnId = ${pageName}Control.dataset.getValue("CRDN_ID"); let sggCd = ${pageName}Control.dataset.getValue("SGG_CD"); let taskSeCd = ${pageName}Control.dataset.getValue("TASK_SE_CD"); @@ -204,7 +323,7 @@ } // 발송 반송 정보 - fnBtnSndngInfo${pageName} = () => { + fnSndngInfo${pageName} = () => { let crdnId = ${pageName}Control.dataset.getValue("CRDN_ID"); // 단속 ID 가 없다면.. return @@ -228,7 +347,7 @@ } // 처리 상세 정보 - fnBtnPrcsDtlInfo${pageName} = () => { + fnPrcsDtlInfo${pageName} = () => { let crdnId = ${pageName}Control.dataset.getValue("CRDN_ID"); // 단속 ID 가 없다면.. return @@ -252,7 +371,7 @@ } // 부과체납 정보 - fnBtnLevyNpmntInfo${pageName} = () => { + fnLevyNpmntInfo${pageName} = () => { let crdnId = ${pageName}Control.dataset.getValue("CRDN_ID"); // 단속 ID 가 없다면.. return @@ -276,7 +395,7 @@ } // 수납 정보 - fnBtnRcvmtInfo${pageName} = () => { + fnRcvmtInfo${pageName} = () => { let crdnId = ${pageName}Control.dataset.getValue("CRDN_ID"); // 단속 ID 가 없다면.. return @@ -300,7 +419,7 @@ } // 민원상담 정보 - fnBtnCvlcptDscsnInfo${pageName} = () => { + fnCvlcptDscsnInfo${pageName} = () => { let crdnId = ${pageName}Control.dataset.getValue("CRDN_ID"); let vhrno = ${pageName}Control.dataset.getValue("VHRNO"); @@ -340,7 +459,7 @@ ${pageName}Control.setData([${totalInfo}]); // - fnBtnCrdnPayerInfo${pageName}(); + fnCrdnPayerInfo${pageName}(); }); // #sourceURL=sprt02010-main.jsp