diff --git a/src/main/java/cokr/xit/fims/sndb/SndbQuery.java b/src/main/java/cokr/xit/fims/sndb/SndbQuery.java index 3cf64525..e14d42e4 100644 --- a/src/main/java/cokr/xit/fims/sndb/SndbQuery.java +++ b/src/main/java/cokr/xit/fims/sndb/SndbQuery.java @@ -41,6 +41,7 @@ public class SndbQuery extends CmmnQuery { private String schSvbtcYmdFrom; // 공시송달(TB_SVBTC)_공시송달 일자 시작 private String schSvbtcYmdTo; // 공시송달(TB_SVBTC)_공시송달 일자 종료 private String schSndngSeCd; // 발송, 발송상세(TB_SNDNG_DTL)_발송 구분 코드 + private String schChcRgIndct; // 선택 등기 표시 // 상세 검색 조건 private String schDetailRegDtOpt; // 상세 검색 등록 일자 구분 private String schDetailRegDtFrom; // 상세 검색 등록 일자 시작 @@ -299,6 +300,16 @@ public class SndbQuery extends CmmnQuery { return self(); } + public String getSchChcRgIndct() { + return ifEmpty(schChcRgIndct, () -> null); + } + + public T setSchChcRgIndct(String schChcRgIndct) { + this.schChcRgIndct = schChcRgIndct; + + return self(); + } + // 상세 검색 조건 /////////////////////////////////////////////////////////////// public String getSchDetailRegDtOpt() { return ifEmpty(schDetailRegDtOpt, () -> null); diff --git a/src/main/java/cokr/xit/fims/sndb/service/bean/SndngBean.java b/src/main/java/cokr/xit/fims/sndb/service/bean/SndngBean.java index 5112f4cd..dde58818 100644 --- a/src/main/java/cokr/xit/fims/sndb/service/bean/SndngBean.java +++ b/src/main/java/cokr/xit/fims/sndb/service/bean/SndngBean.java @@ -142,7 +142,6 @@ public class SndngBean extends AbstractComponent { * @return 반송 목록 */ public List getSndbkList(SndbQuery req) { - return sndngMapper.selectSndbkList(req); } diff --git a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml index c589c350..2103c415 100644 --- a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml @@ -1006,7 +1006,7 @@ AND (SD.SNDNG_RCVMT_CD IS NULL OR SD.SNDNG_RCVMT_CD = '') AND (S.RESND_YN IS NULL OR S.RESND_YN = 'N') - + AND ( (SD.SNDNG_DTL_STTS_CD = #{sndngDtlSttsCd}) OR (EDR.RELRECPRSNCD BETWEEN '13' AND '16') OR (RCPN_REL_NM IN (#{rcpnRelNm1}, #{rcpnRelNm2}, #{rcpnRelNm3}, #{rcpnRelNm4})) ) diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp index 533a5b7d..e6c07333 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp @@ -280,7 +280,7 @@ // URL var ${pageName}PrefixUrl = "/sndb/sndb01"; // FormFields - var ${pageName}Fields = new FormFields("#frmSearch--${pageName}"); + var ${pageName}Fields = new FimsFormFields("#frmSearch--${pageName}"); // 공통 코드 var FIM004 = new CommonCodes(${FIM004}, true); // 주정차위반 내역 코드 var FIM005 = new CommonCodes(${FIM005}, true); // 전용차로위반 내역 코드 diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp index c34dfa5c..cb03884f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp @@ -19,8 +19,8 @@
- - + +
@@ -161,7 +161,7 @@ // URL var ${pageName}PrefixUrl = "/sndb/sndb01"; // FormFields - var ${pageName}Fields = new FormFields("#frmEdit--${pageName}"); + var ${pageName}Fields = new FimsFormFields("#frmEdit--${pageName}"); /************************************************************************** * DatasetControl diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01030-main.jsp index 2b7e5830..864bfb68 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01030-main.jsp @@ -201,7 +201,7 @@ // URL var ${pageName}PrefixUrl = "/sndb/sndb01"; // FormFields - var ${pageName}Fields = new FormFields("#frmSearch--${pageName}"); + var ${pageName}Fields = new FimsFormFields("#frmSearch--${pageName}"); /************************************************************************** * DatasetControl diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01040-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01040-info.jsp index 5f4c7df4..e31a5e52 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01040-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01040-info.jsp @@ -111,7 +111,7 @@ // URL var ${pageName}PrefixUrl = "/sndb/sndb01"; // FormFields - var ${pageName}Fields = new FormFields("#frmEdit--${pageName}"); + var ${pageName}Fields = new FimsFormFields("#frmEdit--${pageName}"); /************************************************************************** * DatasetControl diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01050-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01050-main.jsp index a0e4adf8..634a7dc3 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01050-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01050-main.jsp @@ -265,7 +265,7 @@ // URL var ${pageName}PrefixUrl = "/sndb/sndb01"; // FormFields - var ${pageName}Fields = new FormFields("#frmSearch--${pageName}"); + var ${pageName}Fields = new FimsFormFields("#frmSearch--${pageName}"); // 공통 코드 var FIM004 = new CommonCodes(${FIM004}, true); var FIM005 = new CommonCodes(${FIM005}, true); diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01060-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01060-info.jsp index 3de3d98b..ead0b5a8 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01060-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01060-info.jsp @@ -19,8 +19,8 @@
- - + +
@@ -157,7 +157,7 @@ // URL var ${pageName}PrefixUrl = "/sndb/sndb01"; // FormFields - var ${pageName}Fields = new FormFields("#frmEdit--${pageName}"); + var ${pageName}Fields = new FimsFormFields("#frmEdit--${pageName}"); /************************************************************************** * DatasetControl diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01070-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01070-main.jsp index f3da18f9..8765ea59 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01070-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01070-main.jsp @@ -201,7 +201,7 @@ // URL var ${pageName}PrefixUrl = "/sndb/sndb01"; // FormFields - var ${pageName}Fields = new FormFields("#frmSearch--${pageName}"); + var ${pageName}Fields = new FimsFormFields("#frmSearch--${pageName}"); /************************************************************************** * DatasetControl diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp index 7c45bcbd..b6e94e25 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp @@ -131,7 +131,7 @@ // URL var ${pageName}PrefixUrl = "/sndb/sndb01"; // FormFields - var ${pageName}Fields = new FormFields("#frmEdit--${pageName}"); + var ${pageName}Fields = new FimsFormFields("#frmEdit--${pageName}"); /************************************************************************** * DatasetControl diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01090-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01090-main.jsp index 1fb243b8..e79ffa24 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01090-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01090-main.jsp @@ -204,7 +204,7 @@ // URL var ${pageName}PrefixUrl = "/sndb/sndb01"; // FormFields - var ${pageName}Fields = new FormFields("#frmSearch--${pageName}"); + var ${pageName}Fields = new FimsFormFields("#frmSearch--${pageName}"); /************************************************************************** * DatasetControl diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01100-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01100-info.jsp index 36aa84e9..2022e192 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01100-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01100-info.jsp @@ -120,7 +120,7 @@ // URL var ${pageName}PrefixUrl = "/sndb/sndb01"; // FormFields - var ${pageName}Fields = new FormFields("#frmEdit--${pageName}"); + var ${pageName}Fields = new FimsFormFields("#frmEdit--${pageName}"); /************************************************************************** * DatasetControl diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01110-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01110-main.jsp index e4b450aa..d9d448c1 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01110-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01110-main.jsp @@ -133,7 +133,7 @@ // URL var ${pageName}PrefixUrl = "/sndb/sndb01"; // FormFields - var ${pageName}Fields = new FormFields("#frmEdit--${pageName}"); + var ${pageName}Fields = new FimsFormFields("#frmEdit--${pageName}"); /************************************************************************** * DatasetControl diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01210-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01210-main.jsp index 4b9cc90e..64340953 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01210-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01210-main.jsp @@ -238,7 +238,7 @@ // URL var ${pageName}PrefixUrl = "/levy/levy01"; // FormFields - var ${pageName}Fields = new FormFields("#frmSearch--${pageName}"); + var ${pageName}Fields = new FimsFormFields("#frmSearch--${pageName}"); /************************************************************************** * DatasetControl diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01220-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01220-info.jsp index c962baaf..1600a4e4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01220-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01220-info.jsp @@ -179,12 +179,8 @@ **************************************************************************/ // URL var ${pageName}PrefixUrl = "/excl/excl02"; - // 호출 용도 - var ${pageName}CallPurpose = "${callPurpose}"; // FormFields - var ${pageName}Fields = new FormFields("#frmEdit--${pageName}"); - // 파일 리스트 - var $fileListArr = new Array(); + var ${pageName}Fields = new FimsFormFields("#frmEdit--${pageName}"); /************************************************************************** * DatasetControl @@ -293,183 +289,6 @@ /************************************************************************** * 버튼 clickEvent **************************************************************************/ - // 납부자 정보를 진술자 정보로 입력한다. - fnPayer${pageName} = () => { - // 수정이라면 동작하지 않게 한다. - if (${pageName}Control.getValue("OPNN_ID") != "") { - return; - } - - $("select[name='ownrRelCd'] option:contains('본인')").attr("selected", "selected"); - $("#sttrNm--${pageName}").val(${pageName}Control.getValue("RTPYR_NM")); - $("#sttrBrdt--${pageName}").val(${pageName}Control.getValue("RTPYR_BRDT")); - $("#sttrAddr--${pageName}").val(${pageName}Control.getValue("ADDR")); - $("#sttrZip--${pageName}").val(${pageName}Control.getValue("ZIP")); - $("#sttrDaddr--${pageName}").val(${pageName}Control.getValue("DTL_ADDR")); - - if (${pageName}Control.getValue("RTPYR_MBL_TELNO") != "") - $("#sttrCttpc--${pageName}").val(${pageName}Control.getValue("RTPYR_MBL_TELNO")); - else - $("#sttrCttpc--${pageName}").val(${pageName}Control.getValue("RTPYR_TELNO")); - - $("#sttrEml--${pageName}").val(${pageName}Control.getValue("RTPYR_EML")); - } - - // 우편번호 검색 - fnZip${pageName} = () => { - let callbackFuncName = "fnZipReturn${pageName}"; - - let popupWidth = 900; - let popupHeight = 700; - - let popupX = (window.screen.width / 2) - (popupWidth / 2); - let popupY= (window.screen.height / 2) - (popupHeight / 2); - - window.open( - wctx.url("/resources/html/searchAddr.html"+"?callbackFuncName="+callbackFuncName) - ,"searchAddr" - ,'status=no, height=' + popupHeight + ', width=' + popupWidth + ', left='+ popupX + ', top='+ popupY - ); - } - - // 우편번호 검색 결과 - fnZipReturn${pageName} = (obj) => { - $("#sttrAddr--${pageName}").val(obj.ADDR); // 주소 - $("#sttrZip--${pageName}").val(obj.ZIP); // 우편번호 - $("#sttrDaddr--${pageName}").val(obj.DTL_ADDR); // 상세 주소 - } - - // 저장 - fnSave${pageName} = () => { - // validate 확인 - if (!customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; - - dialog.alert({ - content : "현재 " + ${pageName}Control.prefixName + " 정보를 저장하시겠습니까?" - , onOK : () => { - ${pageName}Control.save(${pageName}Fields.get()); - } - }); - } - - // 첨부파일 조회 - fnSearchFileList${pageName} = (opnnId) => { - // 의견제출 등록일 경우에는 첨부파일을 조회하지 안는다.. - if (opnnId == null || opnnId == "") { - return; - } - - // 첨부파일 리스트 - ajax.get({ - url : "file/list.do" - , data : { - infoType : "110" - , infoKeys : opnnId - , fetchSize : 0 - } - , success : resp => { - let fileNo = 0; - let fileList = resp.fileList; - - fileList.forEach(function (item, index, array) { - fileNo = index + 1; - - let innerHtml = ""; - - innerHtml += ""; - innerHtml += "" + fileNo + ""; - innerHtml += "" + item.FILE_ID + ""; - innerHtml += "" + item.FILE_NM + ""; - innerHtml += "" + item.FILE_SIZE + " byte"; - innerHtml += "" + "" + ""; - innerHtml += "" + "" + ""; - innerHtml += ""; - - $("#fileList--${pageName} > tbody:last").append(innerHtml); - }); - } - }); - } - - // 첨부파일 등록 - fnAddFiles = (obj) => { - let fileNo = $("#fileList--${pageName} > tbody tr").length; // table의 tr 개수 - - let maxFileCnt = 3; // 첨부파일 최대 개수 - let attFileCnt = obj.files.length; // 선택한 파일 개수 + 기존 파일 개수 - let fileArr = new Array(); // 파일 배열 - - fileArr = $fileListArr; - - // 등록할 파일 개수 확인 - if (attFileCnt + fileNo > maxFileCnt) { - dialog.alert({ - content : "첨부파일은 최대 " + maxFileCnt + "개 까지 첨부 가능합니다." - }); - - return; - } - - // 첨부파일을 table에 추가. - for (let iLoop = 0; iLoop < attFileCnt; iLoop++) { - let selectedFile = obj.files[iLoop]; - let innerHtml = ""; - - fileNo += 1; - - innerHtml += ""; - innerHtml += "" + fileNo + ""; - innerHtml += "" + ""; - innerHtml += "" + selectedFile.name + ""; - innerHtml += "" + selectedFile.size + " byte"; - innerHtml += "" + ""; - innerHtml += "" + "" + ""; - innerHtml += ""; - - $("#fileList--${pageName} > tbody:last").append(innerHtml); - - fileArr.push(obj.files[iLoop]); - } - } - - // 파일 삭제 - fnFileRemove${pageName} = (obj) => { - let tr = $(obj).parent().parent(); // 클릭한 버튼이 속한 tr 요소 - let td = tr.children(); - - let fileNo = td.eq(0).text(); // 삭제할 파일 번호 - let fileId = td.eq(1).text(); - - if (fileId != null && fileId != "") { - ajax.post({ - url : "file/remove.do" - , data : { fileIDs : fileId } - , success : resp => { - // 성공 - } - }); - } else { - // 배열에서 삭제한다. 배열은 0부터 시작하기 때문에 -1 해준다. - $fileListArr.splice(fileNo - 1); - } - - $(obj).closest("tr").remove(); // table 에서 제거 - } - - // 첨부파일 삭제 버튼 클릭 - fnFileRemove${pageName} = (obj) => { - dialog.alert({ - content : "선택한 파일을 삭제하시겠습니까?" - , onOK : () => { - fnFileRemove${pageName}(obj); - } - }); - } - - // 첨부파일 다운로드 - fnFileDownload${pageName} = (fileID) => { - top.location.href = "/file/download.do?fileID=" + fileID; - } /************************************************************************** * script 진입 diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01230-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01230-main.jsp index de1ff119..34044688 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01230-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01230-main.jsp @@ -116,11 +116,9 @@
-
-
- - -
+
+ +
@@ -289,7 +287,7 @@ // URL var ${pageName}PrefixUrl = "/sndb/sndb01"; // FormFields - var ${pageName}Fields = new FormFields("#frmSearch--${pageName}"); + var ${pageName}Fields = new FimsFormFields("#frmSearch--${pageName}"); // 공통 코드 var FIM004 = new CommonCodes(${FIM004}, true); var FIM005 = new CommonCodes(${FIM005}, true); @@ -539,6 +537,8 @@ // 검색조건 ${pageName}Control.query = ${pageName}Fields.get(); + let aaa = ${pageName}Fields.get(); +debugger; ${pageName}Control.query.fetchSize = FETCH_XS; // 한번에 조회되는 자료 건수 FETCH_XS = 30 ${pageName}Control.query.sndngDtlSttsCd = "05"; // FIM050 - 05 반송 ${pageName}Control.query.rcpnRelNm1 = "무인배달"; // 13 diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01240-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01240-main.jsp index 2c1c61ba..017f1c85 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01240-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01240-main.jsp @@ -224,7 +224,7 @@ // URL var ${pageName}PrefixUrl = "/sndb/sndb01"; // FormFields - var ${pageName}Fields = new FormFields("#frmSearch--${pageName}"); + var ${pageName}Fields = new FimsFormFields("#frmSearch--${pageName}"); /************************************************************************** * DatasetControl diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01250-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01250-info.jsp index e2a7bdb5..b51a2dae 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01250-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01250-info.jsp @@ -19,11 +19,11 @@ - -