diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml index 15d6e2ef..a56407c0 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml @@ -1325,6 +1325,7 @@ WHERE T1.adr_seq = #param# AND T1.sbmt_ty LIKE LEFT(T2.stat_cd, 4) + '%' AND DECODE(T1.sbmt_yn1, 'N', T1.sbmt_id1, DECODE(T1.sbmt_yn2, 'N', T1.sbmt_id2, DECODE(T1.sbmt_yn3, 'N', T1.sbmt_id3))) = T3.esntlId + AND T2.stat_cd LIKE LEFT(stat_cd, 4) + '90' diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index d1877e3f..b9dec0d7 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -337,8 +337,48 @@ $(document).ready(function(){ } //결재 팝업 이후 처리내용 - function fnc_aprvl_pop_ret(param){ - location.reload(); + function fnc_aprvl_pop_ret(sbmtSeq, sbmtTy){ + $('#sbmtSeq').val(sbmtSeq); + $('#sbmtTy').val(sbmtTy); + fncApprPass(); +// location.reload(); + } + + /* 기일통지서 승인요청 후 자동으로 조정부장 결재되도록 처리 */ + function fncApprPass(){ + var data = { + adrSeq : $("#adrSeq").val(), + adrSn : $("#adrSn").val(), + sbmtSeq : $("#sbmtSeq").val(), + sbmtTy : $("#sbmtTy").val(), + sbmtYn : 'Y' + } + + var statCd = $('#statCd').val(); + $.ajax({ + type: "POST", + url: "/web/kccadr/adjcclt/ai/adjstConciliatorApmSave.do", + data: JSON.stringify(data), + dataType:'json', + async: false, + processData: false, + contentType: "application/json", + cache: false, + success: function (returnData, status) { + if(returnData.result == 'FAIL'){ + if(returnData.message != ''){ + alert(returnData.message); + }else{ + alert("처리중 오류가 발생하였습니다."); + } + }else if(returnData.result == 'SUCCESS'){ + var s_adrHstryMgrSeq = returnData.adrHstryMgrSeq; + + } + location.reload(); + }, + error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); } + }); } /* 워크플로우 */ @@ -771,6 +811,16 @@ $(document).ready(function(){ + + + + + + + + + +
" /> " /> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp index e6c1a699..301a5a2e 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp @@ -207,9 +207,10 @@ } //결재 팝업 이후 처리내용 - function fnc_aprvl_pop_ret(param){ - //location.reload(); - fncGoList('list'); //조정진행목록으로 + function fnc_aprvl_pop_ret(sbmtSeq, sbmtTy){ + $('#sbmtSeq').val(sbmtSeq); + $('#sbmtTy').val(sbmtTy); + fncApprPass(); } function sendDlvInfoPop() { @@ -285,6 +286,77 @@ } + /* 불성립종결 승인요청 후 자동으로 조정부장 결재되도록 처리 */ + function fncApprPass(){ + var data = { + adrSeq : $("#adrSeq").val(), + adrSn : $("#adrSn").val(), + sbmtSeq : $("#sbmtSeq").val(), + sbmtTy : $("#sbmtTy").val(), + sbmtYn : 'Y' + } + + var statCd = $('#statCd').val(); + $.ajax({ + type: "POST", + url: "/web/kccadr/adjcclt/ai/adjstConciliatorApmSave.do", + data: JSON.stringify(data), + dataType:'json', + async: false, + processData: false, + contentType: "application/json", + cache: false, + success: function (returnData, status) { + if(returnData.result == 'FAIL'){ + if(returnData.message != ''){ + alert(returnData.message); + }else{ + alert("처리중 오류가 발생하였습니다."); + } + }else if(returnData.result == 'SUCCESS'){ + var s_adrHstryMgrSeq = returnData.adrHstryMgrSeq; + + var exportUrl = ""; + + exportUrl = "/kccadr/adjPgrMgr/crt/crtOzExportAjax.do"; + //불성립종결 통보서 종결문서 번호 입력 + $('#detailForm #closeDocTy').val("70"); + ozExportReport(exportUrl); +// alert("승인되었습니다."); + } + location.reload(); + }, + error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); } + }); + } + + function ozExportReport(exportUrl){ + + var data = new FormData(document.getElementById("detailForm")); + + $.ajax({ + type: "POST", + url: exportUrl, + data: data, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success: function (returnData, status) { + console.log(returnData.result); + //alert(returnData.result); + if(returnData.result == 'SUCCESS'){ + + }else{ + alert(returnData.message); + } + }, + error: function (e) { alert("Export 요청에 실패하였습니다."); console.log("ERROR : ", e); } + }); + + } + @@ -298,6 +370,17 @@
+ + + + + + + + + + +
" /> " /> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp index 5350824a..76d02fcb 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp @@ -278,9 +278,10 @@ } //결재 팝업이후 처리 내용 - function fnc_aprvl_pop_ret(param){ - //updtDntSbmt(); //SBMT_YN='Y'로 처리 - fncGoList(); //조정진행목록으로 + function fnc_aprvl_pop_ret(sbmtSeq, sbmtTy){ + $('#sbmtSeq').val(sbmtSeq); + $('#sbmtTy').val(sbmtTy); + fncApprPass(); } function sendDlvInfoPop() { @@ -356,6 +357,77 @@ } + /* 조정조서 승인요청 후 자동으로 조정부장 결재되도록 처리 */ + function fncApprPass(){ + var data = { + adrSeq : $("#adrSeq").val(), + adrSn : $("#adrSn").val(), + sbmtSeq : $("#sbmtSeq").val(), + sbmtTy : $("#sbmtTy").val(), + sbmtYn : 'Y' + } + + var statCd = $('#statCd').val(); + $.ajax({ + type: "POST", + url: "/web/kccadr/adjcclt/ai/adjstConciliatorApmSave.do", + data: JSON.stringify(data), + dataType:'json', + async: false, + processData: false, + contentType: "application/json", + cache: false, + success: function (returnData, status) { + if(returnData.result == 'FAIL'){ + if(returnData.message != ''){ + alert(returnData.message); + }else{ + alert("처리중 오류가 발생하였습니다."); + } + }else if(returnData.result == 'SUCCESS'){ + var s_adrHstryMgrSeq = returnData.adrHstryMgrSeq; + + var exportUrl = ""; + + exportUrl = "/kccadr/adjPgrMgr/drtCtr/drtCtrOzExportAjax.do"; + //조정조서 종결문서 번호 입력 + $('#detailForm #closeDocTy').val("40"); + ozExportReport(exportUrl); +// alert("승인되었습니다."); + } + location.reload(); + }, + error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); } + }); + } + + function ozExportReport(exportUrl){ + + var data = new FormData(document.getElementById("detailForm")); + + $.ajax({ + type: "POST", + url: exportUrl, + data: data, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success: function (returnData, status) { + console.log(returnData.result); + //alert(returnData.result); + if(returnData.result == 'SUCCESS'){ + + }else{ + alert(returnData.message); + } + }, + error: function (e) { alert("Export 요청에 실패하였습니다."); console.log("ERROR : ", e); } + }); + + } + @@ -370,6 +442,16 @@
+ + + + + + + + + +
" /> " /> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp index 3d263c3e..2a43a5ff 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp @@ -219,9 +219,12 @@ } //결재 팝업 이후 처리내용 - function fnc_aprvl_pop_ret(param){ + function fnc_aprvl_pop_ret(sbmtSeq, sbmtTy){ //location.reload(); - fncGoList('list'); //조정진행목록으로 + $('#sbmtSeq').val(sbmtSeq); + $('#sbmtTy').val(sbmtTy); +// fncGoList('list'); //조정진행목록으로 + fncApprPass(); } function sendDlvInfoPop() { @@ -305,6 +308,77 @@ } + /* 직권조정 승인요청 후 자동으로 조정부장 결재되도록 처리 */ + function fncApprPass(){ + var data = { + adrSeq : $("#adrSeq").val(), + adrSn : $("#adrSn").val(), + sbmtSeq : $("#sbmtSeq").val(), + sbmtTy : $("#sbmtTy").val(), + sbmtYn : 'Y' + } + + var statCd = $('#statCd').val(); + $.ajax({ + type: "POST", + url: "/web/kccadr/adjcclt/ai/adjstConciliatorApmSave.do", + data: JSON.stringify(data), + dataType:'json', + async: false, + processData: false, + contentType: "application/json", + cache: false, + success: function (returnData, status) { + if(returnData.result == 'FAIL'){ + if(returnData.message != ''){ + alert(returnData.message); + }else{ + alert("처리중 오류가 발생하였습니다."); + } + }else if(returnData.result == 'SUCCESS'){ + var s_adrHstryMgrSeq = returnData.adrHstryMgrSeq; + + var exportUrl = ""; + + exportUrl = "/kccadr/adjPgrMgr/oad/oadOzExportAjax.do"; + //조정종결문서 번호 입력 + $('#detailForm #closeDocTy').val("60"); + ozExportReport(exportUrl); +// alert("승인되었습니다."); + } + location.reload(); + }, + error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); } + }); + } + + function ozExportReport(exportUrl){ + + var data = new FormData(document.getElementById("detailForm")); + + $.ajax({ + type: "POST", + url: exportUrl, + data: data, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success: function (returnData, status) { + console.log(returnData.result); + //alert(returnData.result); + if(returnData.result == 'SUCCESS'){ + + }else{ + alert(returnData.message); + } + }, + error: function (e) { alert("Export 요청에 실패하였습니다."); console.log("ERROR : ", e); } + }); + + } + @@ -318,6 +392,16 @@
+ + + + + + + + + +
" /> " /> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop502030.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop502030.jsp index 13fc27fc..954d2442 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop502030.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop502030.jsp @@ -862,7 +862,7 @@ function fn_save_aprvl() { if (returnData.status == "success") { alert("결재요청 완료되었습니다."); //top.window.opener.parent.location.reload(); - top.window.opener.fnc_aprvl_pop_ret(); + top.window.opener.fnc_aprvl_pop_ret(returnData.sbmtSeq, $("#sbmtTyCd").val()); fncGoClose(); }else{ alert("ERROR"); diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp index 968a1107..711c7be0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp @@ -237,9 +237,11 @@
신청내용 -
- 신청취지 : 피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(₩3,000,000)을 지급한다. -
+ +
+ +
+
@@ -256,9 +258,11 @@
신청내용 -
- 신청취지 : 피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(₩3,000,000)을 지급한다. -
+ +
+ +
+
@@ -276,9 +280,11 @@
신청내용 -
- 신청취지 : 피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(₩3,000,000)을 지급한다. -
+ +
+ +
+