diff --git a/src/main/java/cokr/xit/fims/levy/LevyQuery.java b/src/main/java/cokr/xit/fims/levy/LevyQuery.java index 351c5a1b..0c041f7a 100644 --- a/src/main/java/cokr/xit/fims/levy/LevyQuery.java +++ b/src/main/java/cokr/xit/fims/levy/LevyQuery.java @@ -23,7 +23,6 @@ public class LevyQuery extends CmmnQuery { private String[] rductIDs; // 감경 IDs private String rductId; // 감경 ID // 검색 조건 - private String schTaskSeCd; // 업무 구분 코드(FIM054) private String schRductYmdFrom; // 감경 일자 시작 private String schRductYmdTo; // 감경 일자 종료 private String schCrdnYmdFrom; // 단속 일자 시작 @@ -32,12 +31,7 @@ public class LevyQuery extends CmmnQuery { private String schRtpyrNo; // 납부자 번호 private String schRtpyrNm; // 납부자 명 // 상세 검색 조건 - private String schDetailRegDtOpt; // 상세 검색 등록 일자 구분 - private String schDetailRegDtFrom; // 상세 검색 등록 일자 시작 - private String schDetailRegDtTo; // 상세 검색 등록 일자 종료 - private String schDetailRgtrOpt; // 상세 검색 등록 사용자 구분 - private String schDetailRgtrNm; // 상세 검색 등록 사용자 명 - private String schDetailRgtrCd; // 상세 검색 등록 사용자 코드 + // ETC private String callPurpose; // 호출용도 필요시 사용 (view 조회, create 등록, update 수정, refresh 재조회) private String delYn; // 삭제 여부 @@ -94,16 +88,6 @@ public class LevyQuery extends CmmnQuery { return self(); } - public String getSchTaskSeCd() { - return ifEmpty(schTaskSeCd, () -> null); - } - - public T setSchTaskSeCd(String schTaskSeCd) { - this.schTaskSeCd = schTaskSeCd; - - return self(); - } - public String getSchRductYmdFrom() { return ifEmpty(schRductYmdFrom, () -> null); } @@ -168,59 +152,7 @@ public class LevyQuery extends CmmnQuery { } // 상세 검색 조건 /////////////////////////////////////////////////////////////// - public String getSchDetailRegDtOpt() { - return ifEmpty(schDetailRegDtOpt, () -> null); - } - - public T setSchDetailRegDtOpt(String schDetailRegDtOpt) { - this.schDetailRegDtOpt = schDetailRegDtOpt; - return self(); - } - - public String getSchDetailRegDtFrom() { - return ifEmpty(schDetailRegDtFrom, () -> null); - } - - public T setSchDetailRegDtFrom(String schDetailRegDtFrom) { - this.schDetailRegDtFrom = schDetailRegDtFrom; - return self(); - } - - public String getSchDetailRegDtTo() { - return ifEmpty(schDetailRegDtTo, () -> null); - } - public T setSchDetailRegDtTo(String schDetailRegDtTo) { - this.schDetailRegDtTo = schDetailRegDtTo; - return self(); - } - - public String getSchDetailRgtrOpt() { - return ifEmpty(schDetailRgtrOpt, () -> null); - } - - public T setSchDetailRgtrOpt(String schDetailRgtrOpt) { - this.schDetailRgtrOpt = schDetailRgtrOpt; - return self(); - } - - public String getSchDetailRgtrNm() { - return ifEmpty(schDetailRgtrNm, () -> null); - } - - public T setSchDetailRgtrNm(String schDetailRgtrNm) { - this.schDetailRgtrNm = schDetailRgtrNm; - return self(); - } - - public String getSchDetailRgtrCd() { - return ifEmpty(schDetailRgtrCd, () -> null); - } - - public T setSchDetailRgtr(String schDetailRgtrCd) { - this.schDetailRgtrCd = schDetailRgtrCd; - return self(); - } // 상세검색 조건 /////////////////////////////////////////////////////////////// // ETC ///////////////////////////////////////////////////////////////////// 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 6795ab03..a6146a38 100644 --- a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml +++ b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml @@ -147,8 +147,8 @@ LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID AND L.DEL_YN = 'N') WHERE C.SGG_CD = #{sggCd} - - AND C.TASK_SE_CD = #{schTaskSeCd} + + AND C.TASK_SE_CD = #{taskSeCd} AND C.CRDN_YMD = ]]> #{schCrdnYmdFrom} @@ -162,40 +162,6 @@ AND P.RTPYR_NM = #{schRtpyrNm} - - - - AND SUBSTR(C.REG_DT,1,8) = ]]> #{schDetailRegDtFrom} - - - AND SUBSTR(C.REG_DT,1,8) #{schDetailRegDtTo} - - - - - AND SUBSTR(C.MDFCN_DT,1,8) = ]]> #{schDetailRegDtFrom} - - - AND SUBSTR(C.MDFCN_DT,1,8) #{schDetailRegDtTo} - - - - - - - - - AND C.RGTR = #{schDetailRgtrCd} - - - - - AND C.MDFR = #{schDetailRgtrCd} - - - - - 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 63f40f34..52fe179a 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 @@ -38,12 +38,15 @@
- + + + + +
@@ -88,29 +91,29 @@
- +
- + + - ~ -
- +
- + + - +
@@ -141,7 +144,7 @@
- +
@@ -149,10 +152,6 @@ - - - - @@ -160,6 +159,10 @@ + + + + @@ -180,10 +183,6 @@ - - - - @@ -191,6 +190,10 @@ + + + + @@ -230,6 +233,8 @@ **************************************************************************/ // URL var ${pageName}PrefixUrl = "/levy/levy01"; + // FormFields + var ${pageName}Fields = new FormFields("#frmSearch--${pageName}"); /************************************************************************** * DatasetControl @@ -344,34 +349,6 @@ fn_securityModeToggle($("#securityMode--top").is(":checked")); } - // 검색 조건 파라미터 가져오기 - getParams${pageName} = () => { - let formFields = new FimsFormFields("#frmSearch--${pageName}"); - let formData = formFields.get(); - - formData.fetchSize = FETCH_XS; // 한번에 조회되는 자료 건수 - - return formData; - } - - // 수정 dialog -> callback 추가 - ${pageName}Info = (params) => { - ajax.get({ - url : wctx.url("/" + params.taskSeCd + ${pageName}PrefixUrl + "/020/info.do?openerPageName=${pageName}") - , data : params || {} - , success : resp => { - dialog.open({ - id : ${pageName}Control.prefixed("Dialog") - , title : ${pageName}Control.prefixName + " 정보" - , content : resp - , size : ${pageName}Control.infoSize - , init : () => { } - , onClose : () => { ${pageName}Control.load(${pageName}Control.query.pageNum); } // callback - }); - } - }); - } - /************************************************************************** * 초기 설정 **************************************************************************/ @@ -422,14 +399,18 @@ // 화면 초기값 설정 setForm${pageName} = (taskSeCd) => { // 업무 구분 코드 - $("#schTaskSeCd--${pageName}").val(taskSeCd); + $("#frmSearch--${pageName} input[name='taskSeCd'][value='" + taskSeCd + "']").prop("checked", true); // 최고 관리자 경우 업무구분을 선택할 수 있도록 하자. -// if () { -// $("#schTaskSeCd--${pageName}").prop("disabled", false); -// } else { - $("#schTaskSeCd--${pageName}").prop("disabled", true); -// } +// if () { +// $("#frmSearch--${pageName} input[name='taskSeCd']").each(function(i) { +// $(this).prop("disabled", "false"); +// }); +// } else { + $("#frmSearch--${pageName} input[name='taskSeCd']").each(function(i) { + $(this).prop("disabled", "true"); + }); +// } // 달력 초기화 initDatepicker("frmSearch--${pageName}"); @@ -444,35 +425,9 @@ ${pageName}Control.urls.getInfo = wctx.url("/" + taskSeCd + "/sprt/sprt02/010/main.do"); // 개별총정보 } - // - changeTaskSeCd${pageName} = (taskSeCd) => { - ${pageName}Control.urls.load = wctx.url("/" + taskSeCd + ${pageName}PrefixUrl + "/010/list.do"); // 조회 - ${pageName}Control.urls.getInfo = wctx.url("/" + taskSeCd + "/sprt/sprt02/010/main.do"); // 개별총정보 - } - /************************************************************************** * 버튼 clickEvent **************************************************************************/ - // 업무 구분 변경 - fnResetAndChangeBiz${pageName} = (taskSeCd) => { - // 화면 초기화 - $("#frmSearch--${pageName}")[0].reset(); - - // 업무 구분 코드 - if (typeof taskSeCd == "undefined" || taskSeCd == null || taskSeCd == "") { - taskSeCd = $("#layout-navbar input[name='taskSeCd']:checked").val(); - } - - // 화면 초기값 설정 - setForm${pageName}(taskSeCd); - - // URL 설정 - setURL${pageName}(taskSeCd); - - // dataset 초기화 - ${pageName}Control.dataset.clear(); - } - // 초기화 버튼 이벤트 fnReset${pageName} = () => { fnResetAndChangeBiz${pageName}(); @@ -481,8 +436,9 @@ // 검색 버튼 이벤트 fnSearchList${pageName} = () => { // 검색조건 - ${pageName}Control.query = getParams${pageName}(); + ${pageName}Control.query = ${pageName}Fields.get(); + ${pageName}Control.query.fetchSize = FETCH_XS; // 한번에 조회되는 자료 건수 FETCH_XS = 30 ${pageName}Control.query.delYn = "N"; // 삭제 여부 ${pageName}Control.query.crdnDelYn = "N"; // 단속 대장 삭제 여부 @@ -494,6 +450,26 @@ } + // 업무 구분 변경 + fnResetAndChangeBiz${pageName} = (taskSeCd) => { + // 화면 초기화 + $("#frmSearch--${pageName}")[0].reset(); + + // 업무 구분 코드 + if (typeof taskSeCd == "undefined" || taskSeCd == null || taskSeCd == "") { + taskSeCd = $("#layout-navbar input[name='taskSeCd']:checked").val(); + } + + // 화면 초기값 설정 + setForm${pageName}(taskSeCd); + + // URL 설정 + setURL${pageName}(taskSeCd); + + // dataset 초기화 + ${pageName}Control.dataset.clear(); + } + // 감경부과등록 버튼 이벤트 fnCreateRductLevy${pageName} = () => { @@ -512,11 +488,11 @@ // 시군구 코드 설정 $("#sggCd--${pageName}").val("${sggCd}"); // 업무 구분 설정 - let defaultTaskSeCd = $("#layout-navbar input[name='taskSeCd']:checked").val(); - $("#schTaskSeCd--${pageName}").val(defaultTaskSeCd); + let defaultBizValue = $("#layout-navbar input[name='taskSeCd']:checked").val(); + $("#frmSearch--${pageName} input[name='taskSeCd'][value='" + defaultBizValue + "']").prop("checked", true); // 업무 구분 및 화면 초기 설정 - fnResetAndChangeBiz${pageName}(defaultTaskSeCd); + fnResetAndChangeBiz${pageName}(defaultBizValue); });
민원신청번호민원접수번호민원접수일자민원전송 단속일시 차량번호 법정동위반항목 과태료금액 처리상태민원신청번호민원접수번호민원접수일자민원전송결과 납부자명 납부자생일 우편번호 {CVLCPT_APLY_NO}{CVLCPT_RCPT_NO}{CVLCPT_RCPT_YMD}{CVLCPT_TRSM_NM} {CRDN_YMD_TM} {VHRNO} {CRDN_STDG_NM}{VLTN_ARTCL} {FFNLG_AMT} {CRDN_STTS_NM}{CVLCPT_APLY_NO}{CVLCPT_RCPT_NO}{CVLCPT_RCPT_YMD}{CVLCPT_TRSM_NM} {RTPYR_NM} {RTPYR_BRDT} {ZIP}