From e0acf86c7f8794c9fd0992ca2a76cae703d18bf6 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Mon, 7 Nov 2022 15:12:48 +0900
Subject: [PATCH] =?UTF-8?q?2022-11-07=2015:12=20=EA=B8=B0=EC=9D=BC?=
 =?UTF-8?q?=EC=A1=B0=EC=84=9C=20=EB=82=98=EC=98=A4=EA=B2=8C=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp      | 21 +++++++++----------
 .../jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp    | 10 +++++++--
 2 files changed, 18 insertions(+), 13 deletions(-)

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 b88787c7..06c22344 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
@@ -582,7 +582,7 @@ $(document).ready(function(){
 							</c:if>
 							
 							<!-- 기일조서 -->
-							<!-- 
+							<!-- 							 
 							기일조서
 							<br/>${KccadrConstants.ADR_APP_NTC_APPR }
 							<br/>${info.statCd }
@@ -593,17 +593,16 @@ $(document).ready(function(){
 							<br/>/${apmChgDateList}/1
 							<br/>/${drtInfo}/2
 							 -->
+							 
 							<!-- 기일변경승인(204050) 또는 기일승인(204050) 인 경우는 기일변경 내용보기 버튼, 취하종결(305010~305090)은 상시 프로세스이므로 제외-->
-							<c:if test="${(info.statCd== KccadrConstants.ADR_APP_NTC_APPR							 
-										|| fn:indexOf(info.statCd,'30') > -1)
-										&& 
-										(info.statCd < KccadrConstants.ADR_CNCLTBS_APPR_REQ 
-										|| info.statCd > KccadrConstants.ADR_CNCLTBS_RETN)
-										&&
-										(not empty apmChgDateList										
-										|| not empty drtInfo)
-										&&
-										(info.statCd != KccadrConstants.ADR_APP_CHG_APPR)
+							<c:if test="${
+												(info.statCd== KccadrConstants.ADR_APP_NTC_APPR || fn:indexOf(info.statCd,'30') > -1)
+											&& 
+												(info.statCd < KccadrConstants.ADR_CNCLTBS_APPR_REQ || info.statCd > KccadrConstants.ADR_CNCLTBS_RETN)
+											&&	
+												(not empty apmChgDateList	|| not empty drtInfo)
+											&&
+												(info.statCd != KccadrConstants.ADR_APP_CHG_APPR)
 										}">
 							<%-- <c:if test="${(info.statCd== KccadrConstants.ADR_APP_NTC_APPR							 
 										|| info.statCd== KccadrConstants.ADR_APP_CHG_APPR
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 69bcafc8..727749a4 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
@@ -258,7 +258,8 @@
 	
 	//결재 팝업이후 처리 내용
 	function fnc_aprvl_pop_ret(param){
-		fncGoList(); //조정진행목록으로
+		updtDntSbmt();	//SBMT_YN='Y'로 처리
+		//fncGoList(); //조정진행목록으로
 	}	
 	
 	function fncPrint() {
@@ -654,7 +655,12 @@
                         <div class="area_right">
                         	<button type="button" class="btnType06" onclick="fncPrint()">출력</button>
                             <!-- 배당결재완료(202050), 기일변경승인(204050) 기일통지서 반려(205090)인 경우는 기일지정 버튼 표시
-                               , (기존 기일지정값이 없으면 등록, 있으면 기일지정수정) 그외 상태는 버튼이 안보임. -->
+                               , (기존 기일지정값이 없으면 등록, 있으면 기일지정수정) 그외 상태는 버튼이 안보임.
+                               ADR_DEPT_SLCT_COMP		: "202050", // 조정부지정완료 
+                               ADR_APP_NTC_RETN			: "205090", // 기일통지서반려(211104 추가)
+                               ADR_APP_ADD				: "204040", // 기일추가
+                               ADR_APP_CHG_APPR			: "204050", // 기일변경승인
+                               -->
                             <c:if test="${info.statCd== KccadrConstants.ADR_DEPT_SLCT_COMP 
                             || info.statCd== KccadrConstants.ADR_APP_NTC_RETN
                             || info.statCd== KccadrConstants.ADR_APP_ADD