이준호 전자조저이슷템 커밋

전자조정시스템 고도화
   - 조정부장 자동결재
      - 기일통지서 => 완료, 반영 완료
      - 기일조서 => 완료, 반영 완료
      - 종결결재 => 완료, 반영 전
      - 직권조정결정서 => 완료, 반영전
      - 조정조서 => 완료, 반영전
      - 불성립종결통보서 => 완료, 반영전
      - 조정권고안 => ~3.3
      - 기일변경결재요청 => ~3.3
      - 취하종결통보서 => ~3.3
   - (사용자) 사건목록
      - 신청 취지 hover 텍스트가 사용자가 작성한 신청취지 나오도록 수정
         =>완료, 반영전

조정부장 자동결재 중 조정권고안 조정권고안, 기일변경결재요청, 취하종결통보서 제외하고 개발 완료
hover가 특정한 문구만 노출되는 문제도 수정

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'
 		    
     </select>
     

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp

@@ -337,8 +337,48 @@ $(document).ready(function(){
 	}
 	
 	//결재 팝업 이후 처리내용
-	function fnc_aprvl_pop_ret(param){
+	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(){
 		
 	</form>
 	
+	<form:form id="detailForm" name="detailForm" commandName="pgrCmmVO" onsubmit="return false;" method="post">
+	    <input type="hidden" name="adrSeq" id="adrSeq" value="<c:out value='${info.adrSeq}'/>"/>
+	    <input type="hidden" name="adrSn" id="adrSn" value="<c:out value='${info.adrSn}'/>"/>
+	    <input type="hidden" name="sbmtSeq" id="sbmtSeq" value=""/>
+	    <input type="hidden" name="sbmtTy" id="sbmtTy" value=""/>
+	    <input type="hidden" name="appSeq" id="appSeq" value="<c:out value='${info.appSeq}'/>"/>
+	    <input type="hidden" name="statCd" id="statCd" value="<c:out value='${info.statCd}'/>"/>
+	    <input type="hidden" name="closeDocTy" id="closeDocTy" value=""/>
+	</form:form>
+	
 	<form id="entForm" name="entForm" method="post">
 		<input type="hidden" id="adrSeq" name="adrSeq" value="<c:out value="${info.adrSeq}" />" />
 		<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn}" />" />

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp

@@ -207,9 +207,10 @@
 	}
 	
 	//결재 팝업 이후 처리내용
-	function fnc_aprvl_pop_ret(param){
+	function fnc_aprvl_pop_ret(sbmtSeq, sbmtTy){
-		//location.reload();
+		$('#sbmtSeq').val(sbmtSeq);
-		fncGoList('list'); //조정진행목록으로
+		$('#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); }
+        });
+		
+	}
+	
 </script>
 </head>
 <body>
@@ -298,6 +370,17 @@
 		<input type="hidden" id="sbmtTyCd" name="sbmtTyCd" value=""/>
 		
 	</form>
+	
+	<form:form id="detailForm" name="detailForm" commandName="DrtVO" onsubmit="return false;" method="post">
+	    <input type="hidden" name="adrSeq" id="adrSeq" value="<c:out value='${info.adrSeq}'/>"/>
+	    <input type="hidden" name="adrSn" id="adrSn" value="<c:out value='${info.adrSn}'/>"/>
+	    <input type="hidden" name="sbmtSeq" id="sbmtSeq" value=""/>
+	    <input type="hidden" name="sbmtTy" id="sbmtTy" value=""/>
+	    <input type="hidden" name="appSeq" id="appSeq" value="<c:out value='${info.appSeq}'/>"/>
+	    <input type="hidden" name="statCd" id="statCd" value="<c:out value='${info.statCd}'/>"/>
+	    <input type="hidden" name="closeDocTy" id="closeDocTy" value=""/>
+	</form:form>
+	
 	<form id="dlvpop" name="dlvpop" method="post">
 		<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
 		<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn }" />" />

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp

@@ -278,9 +278,10 @@
 	}
 	
 	//결재 팝업이후 처리 내용
-	function fnc_aprvl_pop_ret(param){
+	function fnc_aprvl_pop_ret(sbmtSeq, sbmtTy){
-		//updtDntSbmt();	//SBMT_YN='Y'로 처리
+		$('#sbmtSeq').val(sbmtSeq);
-		fncGoList(); //조정진행목록으로
+		$('#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); }
+        });
+		
+	}
+	
 </script>
 </head>
 <body>
@@ -370,6 +442,16 @@
 		
 	</form>
 	
+	<form:form id="detailForm" name="detailForm" commandName="DrtVO" onsubmit="return false;" method="post">
+	    <input type="hidden" name="adrSeq" id="adrSeq" value="<c:out value='${info.adrSeq}'/>"/>
+	    <input type="hidden" name="adrSn" id="adrSn" value="<c:out value='${info.adrSn}'/>"/>
+	    <input type="hidden" name="sbmtSeq" id="sbmtSeq" value=""/>
+	    <input type="hidden" name="sbmtTy" id="sbmtTy" value=""/>
+	    <input type="hidden" name="appSeq" id="appSeq" value="<c:out value='${info.appSeq}'/>"/>
+	    <input type="hidden" name="statCd" id="statCd" value="<c:out value='${info.statCd}'/>"/>
+	    <input type="hidden" name="closeDocTy" id="closeDocTy" value=""/>
+	</form:form>
+	
 	<form id="dlvpop" name="dlvpop" method="post">
 		<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
 		<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn }" />" />

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); }
+        });
+		
+	}
+	
 </script>
 </head>
 <body>
@@ -318,6 +392,16 @@
 		<input type="hidden" id="sbmtTyCd" name="sbmtTyCd" value=""/>
 		
 	</form>
+	
+	<form:form id="detailForm" name="detailForm" commandName="DrtVO" onsubmit="return false;" method="post">
+	    <input type="hidden" name="adrSeq" id="adrSeq" value="<c:out value='${info.adrSeq}'/>"/>
+	    <input type="hidden" name="adrSn" id="adrSn" value="<c:out value='${info.adrSn}'/>"/>
+	    <input type="hidden" name="sbmtSeq" id="sbmtSeq" value=""/>
+	    <input type="hidden" name="sbmtTy" id="sbmtTy" value=""/>
+	    <input type="hidden" name="appSeq" id="appSeq" value="<c:out value='${info.appSeq}'/>"/>
+	    <input type="hidden" name="statCd" id="statCd" value="<c:out value='${info.statCd}'/>"/>
+	    <input type="hidden" name="closeDocTy" id="closeDocTy" value=""/>
+	</form:form>
 	<form id="dlvpop" name="dlvpop" method="post">
 		<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
 		<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn }" />" />

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");

src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp

@@ -237,9 +237,11 @@
 		                        	<div class="hover_content_wrap">
 			                        	<span class="read_only m_th_text">신청내용</span>
 			                            <a href="#none" onclick="fncCloseDetail('${list.adrSeq}', '${list.adrSn}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a>
+		                            	<c:if test="${!empty list.reqCn1}">
 			                            	<div class="hover_content_box">
-		                            		신청취지 : 피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(￦3,000,000)을 지급한다.
+			                            		<c:out value="${list.reqCn1}"/>
 			                            	</div>
+		                            	</c:if>
 	                            	</div>
 		                        </td>
                         	</c:when>
@@ -256,9 +258,11 @@
 		                        	<div class="hover_content_wrap">
 			                        	<span class="read_only m_th_text">신청내용</span>
 			                            <a href="#none" onclick="fncGoingDetail('${list.adrSeq}', '${list.adrSn}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a>
+		                            	<c:if test="${!empty list.reqCn1}">
 			                            	<div class="hover_content_box">
-		                            		신청취지 : 피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(￦3,000,000)을 지급한다.
+			                            		<c:out value="${list.reqCn1}"/>
 			                            	</div>
+		                            	</c:if>
 	                            	</div>
 		                        </td>                        		
                         	</c:when>
@@ -276,9 +280,11 @@
 		                        	<div class="hover_content_wrap">
 			                        	<span class="read_only m_th_text">신청내용</span>
 			                            <a href="#none" onclick="fncGoDetail('${list.adrSeq}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a>
+		                            	<c:if test="${!empty list.reqCn1}">
 			                            	<div class="hover_content_box">
-		                            		신청취지 : 피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(￦3,000,000)을 지급한다.
+			                            		<c:out value="${list.reqCn1}"/>
 			                            	</div>
+		                            	</c:if>
 	                            	</div>
 		                        </td>                        		
                         	</c:otherwise>