diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml index 44583d16..aa7c31b4 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml @@ -231,7 +231,30 @@ SELECT C.CRDN_ID AND C.CRDN_REG_SE_CD = '02' AND CC.CVLCPT_PRCS_CD IN ('02','03','04') - + + + + + C.CRDN_REG_SE_CD + CC.CVLCPT_APLCNT_NM + CC.CVLCPT_PRCS_PIC_NM + CC.CVLCPT_PRCS_PIC_TELNO + CC.CVLCPT_RCPT_YMD + CC.CVLCPT_PRCS_PRNMNT_DT + C.CRDN_YMD + CC.CVLCPT_RCPT_NO + C.VHRNO + LE.LEVY_EXCL_RSN_CD + C.ETC_CN + + #{term} + + + +AND (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) LIKE CONCAT('%', #{term}, '%') + + + AND CC.CVLCPT_RCPT_YMD = ]]> #{schCvlcptRcptYmdFrom} diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp index ecbfd262..56dadf1f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp @@ -408,7 +408,7 @@ $(document).ready(function(){ return (index+1) + " of " + ds.length; }; } - if(reqKey == "getNextKey"){ + else if(reqKey == "getNextKey"){ parentRes[reqKey] = function(currentKey){ var ds = $P.crdnControl.dataset.getDataset(); var index = ds.findIndex(item => item.CRDN_ID == currentKey); @@ -419,7 +419,7 @@ $(document).ready(function(){ } }; } - if(reqKey == "getPrevKey"){ + else if(reqKey == "getPrevKey"){ parentRes[reqKey] = function(currentKey){ var ds = $P.crdnControl.dataset.getDataset(); var index = ds.findIndex(item => item.CRDN_ID == currentKey); @@ -430,11 +430,14 @@ $(document).ready(function(){ } }; } - if(reqKey == "selectRow"){ + else if(reqKey == "selectRow"){ parentRes[reqKey] = function(currentKey){ $P.clickCrdnList(currentKey); }; } + else { + parentRes[reqKey] = function(){} + } } pageObject.parentRes.push(parentRes); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp index 5a3c7413..e24ff8db 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp @@ -56,6 +56,8 @@
+ +
@@ -70,7 +72,7 @@ - 민원원본보기 + 민원원본보기 답변미리보기 선택자료답변등록실행 답변완료로 수정 @@ -85,20 +87,33 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + @@ -274,12 +289,80 @@ $(document).ready(function(){ return data; } + $P.fnOpenCvlcptOrgnl = () => { + var cur = $P.crdnControl.getCurrent(); + if(cur == null){ + return; + } + + var taskSeCd = $("#frmSearch--${pageName} input[name='taskSeCd']:checked").val(); + + var dialogId = "cvlcptOrgnlDialog--${pageName}"; + ajax.get({ + url : wctx.url("/"+taskSeCd+"/crdn/crdn01/050/info.do"), + data : { crdnId : cur["CRDN_ID"] }, + success : resp => { + dialog.open({ + id : dialogId, + title : "민원내역 원본", + content : resp, + size : "xl", + init : () => { + var parentRes = new Object(); + var childReq = pageObject.childReq.pop(); + + for(var reqKey in childReq) { + if(reqKey == "getCountStatus"){ + parentRes[reqKey] = function(currentKey){ + var ds = $P.crdnControl.dataset.getDataset(); + var index = ds.findIndex(item => item.CRDN_ID == currentKey); + return (index+1) + " of " + ds.length; + }; + } + else if(reqKey == "getNextKey"){ + parentRes[reqKey] = function(currentKey){ + var ds = $P.crdnControl.dataset.getDataset(); + var index = ds.findIndex(item => item.CRDN_ID == currentKey); + if(ds.length > index+1){ + return ds[index+1]["CRDN_ID"]; + } else { + return ""; + } + }; + } + else if(reqKey == "getPrevKey"){ + parentRes[reqKey] = function(currentKey){ + var ds = $P.crdnControl.dataset.getDataset(); + var index = ds.findIndex(item => item.CRDN_ID == currentKey); + if(index != 0 && ds.length > 1){ + return ds[index-1]["CRDN_ID"]; + } else { + return ""; + } + }; + } + else if(reqKey == "selectRow"){ + parentRes[reqKey] = function(currentKey){ + $P.clickCrdnList(currentKey); + }; + } + else { + parentRes[reqKey] = function(){} + } + } + + pageObject.parentRes.push(parentRes); + } + }); + } + }); + } /************************************************************************** * element.on **************************************************************************/ $('#btnReset--${pageName}').on('click', () => $P.fnReset()); $('#btnSearch--${pageName}').on('click', () => $P.searchCrdnList()); - + $("#btnOpenCvlcptOrgnl--${pageName}").on("click", () => $P.fnOpenCvlcptOrgnl()); $("#table-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); }); /**************************************************************************