From 40afa91f5ed7f949ee2b0bc2233f8b52140a4950 Mon Sep 17 00:00:00 2001
From: tolag3 <tolag3@gmail.com>
Date: Fri, 3 Feb 2023 09:56:14 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?=
 =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?=
 =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AprvlMgrServiceImpl.java     |   2 +-
 .../egovProps/globals_local.properties        |   2 +-
 .../adjCourtCnctn/adjCourtCnctnList.jsp       |  12 +-
 .../kccadr/adjPgrMgr/dlvinfo/dlvinfoReg.jsp   |   2 +-
 .../dlvinfo/popup/dlvAdrNoListPop.jsp         |   2 +-
 .../jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp    | 125 +++++++++++++++++-
 6 files changed, 139 insertions(+), 6 deletions(-)

diff --git a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java
index c0e34881..4add0fdb 100644
--- a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java
+++ b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java
@@ -110,7 +110,7 @@ public class AprvlMgrServiceImpl  extends EgovAbstractServiceImpl implements Apr
 		AprvlMgrVO aprvlMgrVOtmp	=	aprvlMgrDAO.select4InsertAdrSbmtMgr(aprvlMgrVO);
 		
 		System.out.println("======================================202210==고도화 결재선 교체==");
-		aprvlMgrVO.setSbmtSeq(aprvlMgrVOtmp.getSbmtSeq());
+		aprvlMgrVO.setSbmtSeq(aprvlMgrVOtmp.getSbmtSeq()); //!!!!!!!!!!!
 
 		
 		if (aprvlMgrVOtmp.getSbmtId1()!=null && !"".equals(aprvlMgrVOtmp.getSbmtId1())) {			
diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties
index 10eb9957..af3f5471 100644
--- a/src/main/resources/egovframework/egovProps/globals_local.properties
+++ b/src/main/resources/egovframework/egovProps/globals_local.properties
@@ -34,7 +34,7 @@ Globals.DriverClassName=cubrid.jdbc.driver.CUBRIDDriver
 #Globals.Url=jdbc:cubrid:158.247.225.133:30000:kcc_adrs4:::?charset=utf8
 #\uac1c\ubc1c\uc11c\ubc84
 #Globals.Url=jdbc:CUBRID:119.193.215.98:30000:kcc_adr_advc_test:::?charset=utf8
-Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc_test:::?charset=utf8
+Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8
 #\uc2e4\uc11c\ubc84
 #Globals.Url=jdbc:cubrid:192.168.39.146:30000:kcc_adr_advc:::?charset=utf8
 
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp
index 9395b372..f7796d80 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp
@@ -175,7 +175,12 @@ function fn_goDetail(courtSeq){
 								<col style="width: 70px">
 								<col style="width: 70px">
 								<col style="width: auto">
-								<col style="width: 70px">
+								
+								<col style="width: 10%">
+								<col style="width: 10%">
+								<col style="width: 10%o">
+								
+								<col style="width: 80px">
 								<col style="width: 10%">
 								<col style="width: 10%">
 							</colgroup>
@@ -186,6 +191,11 @@ function fn_goDetail(courtSeq){
 									<th>분야</th>
 									<th>결과</th>
 									<th>사건번호</th>
+									
+									<th>배당일자</th>
+									<th>사무처리기한</th>
+									<th>보고일자</th>
+									
 									<th>조정위원</th>
 									<th>결정일자</th>
 									<th>삭제</th>
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoReg.jsp
index d60b99e9..7a09a777 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoReg.jsp
@@ -75,7 +75,7 @@
 				$('#memDeptSeq').val(data.info.memDeptSeq);
 				$('#ccTyTx').val(data.info.ccTyTx);
 				$('#adrSeq').val(data.info.adrSeq);
-				dlvryDocTy
+// 				dlvryDocTy
 				creSelect('dlvryDocTy', data.dlvryDocTyList);
 				creSelect2('rpplTy ', data.rpplList);
 			},
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/popup/dlvAdrNoListPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/popup/dlvAdrNoListPop.jsp
index ee558de5..b8793394 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/popup/dlvAdrNoListPop.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/popup/dlvAdrNoListPop.jsp
@@ -55,7 +55,7 @@
 	<input type="hidden" name="searchSortOrd" value="<c:out value="${cmmVO.searchSortOrd}" />" />
 
 	<div class="cont_popup">
-		<p class="tit_text">기일변경신청 목록</p>
+		<p class="tit_text">송달정보 사건번호 목록</p>
 
 		<!-- <ul class="search_form">
 			<li>
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp
index 4285c412..824ac32f 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp
@@ -292,7 +292,9 @@
                 console.log(returnData.result);
                 //alert(returnData.result);
                 if(returnData.result ==  'SUCCESS'){
-                    alert('성공적으로 요청하였습니다.');
+                	// 기일통지서 승인 요청 시 조정부장 결재 자동 처리
+                	fncApprPass();
+                    alert('성공적으로 처리하였습니다.');
                     fncGoList();
                 }else{
                     alert(returnData.message);                                        
@@ -374,6 +376,127 @@
 		}
 		
 	}
+	
+	/* 기일통지서 승인요청 후 자동으로 조정부장 결재되도록 처리 */
+	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;
+                	
+					if(statCd == '205010'){	//기일변경승인처리는 appr_yn 값을 변경하지 않는다.
+						updtDntApprYn('Y', s_adrHstryMgrSeq);
+                   	}
+                   	
+					var exportUrl = "";
+					if(statCd == '205010'){ // 기일통지서 승인 처리시 오즈리포트 Export 요청
+						
+						exportUrl = "/kccadr/adjPgrMgr/dnt/dntOzExportAjax.do";
+						
+					}else if(statCd == '302010'){ // 기일조서 승인 처리시 오즈리포트 Export 요청
+						
+						exportUrl = "/kccadr/adjPgrMgr/drt/drtOzExportAjax.do";
+						
+					}else if(statCd == '303010'){ // 조정권고안 승인 처리시 오즈리포트 Export 요청
+						
+						exportUrl = "/kccadr/adjPgrMgr/arm/armOzExportAjax.do";
+						//조정권고안 종결문서 번호 입력
+						$('#closeDocTy').val("30");
+						
+					}else if(statCd == '304010'){ // 조정조서 승인 처리시 오즈리포트 Export 요청
+						
+						exportUrl = "/kccadr/adjPgrMgr/drtCtr/drtCtrOzExportAjax.do";
+						//조정조서 종결문서 번호 입력
+						$('#closeDocTy').val("40");
+						
+					}else if(statCd == '305010'){ // 취하종결 승인 처리시 오즈리포트 Export 요청
+						
+						exportUrl = "/kccadr/adjPgrMgr/ent/entOzExportAjax.do";
+						//취하종결 문서 번호 입력
+						$('#closeDocTy').val("50");
+						
+					}else if(statCd == '306010'){ // 직권조정결정서 승인 처리시 오즈리포트 Export 요청
+						
+						exportUrl = "/kccadr/adjPgrMgr/oad/oadOzExportAjax.do";
+						//조정종결문서 번호 입력
+						$('#closeDocTy').val("60");
+						
+					}else if(statCd == '307010'){ // 불성립종결 통보서 승인 처리시 오즈리포트 Export 요청
+						
+						exportUrl = "/kccadr/adjPgrMgr/crt/crtOzExportAjax.do";
+						//불성립종결 통보서 종결문서 번호 입력
+						$('#closeDocTy').val("70");
+						
+					}
+					
+					if(exportUrl != ''){
+						//오즈리포트 Export 처리 요청
+						ozExportReport(exportUrl);
+					}
+                       alert("승인되었습니다.");
+                }
+                location.reload();
+            },
+            error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); }
+        });
+	}
+	
+	
+	//기일통지서승인 일자 업데이트 처리해주기
+	function updtDntApprYn(status
+			, s_adrHstryMgrSeq
+			){
+		
+        var data = new FormData(document.getElementById("detailForm"));        
+        data.append("apprYn"    ,status);
+        data.append("assHstrySeq"    ,s_adrHstryMgrSeq);
+		        
+        $.ajax({
+            type: "POST",
+            url: "/web/kccadr/adjcclt/ai/dntUpdApprYnAjax.do",
+            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'){
+                    //alert('성공적으로 요청하였습니다.');
+                    //fncGoList();
+                }else{
+                    alert(returnData.message);                                        
+                }
+            },
+            error: function (e) { alert("요청에 실패하였습니다."); console.log("ERROR : ", e); }
+        });
+	}
 </script>
 </head>
 <body>