From 6273f78d9dc0db841882c60daace61f1d4d27b43 Mon Sep 17 00:00:00 2001
From: hylee <hehihoho3@gmail.com>
Date: Fri, 30 Sep 2022 12:15:20 +0900
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=EA=B3=BC=EA=B1=B0=EC=82=AC?=
 =?UTF-8?q?=EA=B1=B4=EB=93=B1=EB=A1=9D=20->=20=EC=8B=9C=EC=97=B0=EC=9D=84?=
 =?UTF-8?q?=20=EC=9C=84=ED=95=9C=20=ED=99=94=EB=A9=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp   | 4 +++-
 .../jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp  | 6 +++---
 src/main/webapp/js/kccadr/adjReqMgrPast/value.js            | 5 ++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp
index 43bfa86b..0a2db936 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp
@@ -1462,7 +1462,9 @@ $(document).on('change', '#adrSnTemp', function(){
 </div>
 </form:form>
 <form id="nextGoPageForm" action="<c:url value='/kccadr/adjReqMgOff/adjReqMgrPastProgRegist.do' />">
-	<input type="hidden" id="adrSeqHidden" name="adrSeq" value="<c:out value="${adrVO.adrSeq }" />" />
+<%-- 	<input type="hidden" id="adrSeqHidden" name="adrSeq" value="<c:out value="${adrVO.adrSeq }" />" /> --%>
+	<!-- 임시  -->
+	<input type="hidden" id="adrSeqHidden" name="adrSeq" value="ADR_0000000000003130" />
 </form>
 <!-- //cont -->
 </body>
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp
index 47cb6bf2..fea2aaf6 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp
@@ -170,8 +170,8 @@ function fn_addRow(len){
  *	등록버튼 
  */
 $(document).on('click','#regBtn', function(){
-
-	if(!validate())
+	
+	if(validate())
 	{
 		return false;
 	}
@@ -392,7 +392,7 @@ function validate(){
 						<button type="button" id="prevPage" class="btnType04">&lt; 이전단계 이동</button>
 					</div>
 					<div class="area_right">
-						<button type="button" id="regBtn" class="btnType06">다음단계 이동 &gt;</button>
+						<button type="button" id="regBtn" class="btnType06">완료</button>
 					</div>
 				</div>
 			</div>
diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js
index 3fbf0baf..ee4923dd 100644
--- a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js
+++ b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js
@@ -1102,7 +1102,10 @@
 			//신청인 정보 입력
 			var data = new FormData(form);
 
+			//임시
+			$('#nextGoPageForm').submit();
 
+			/*
 			$.ajax({
 		        type: "POST",
 		        url: url,
@@ -1126,7 +1129,7 @@
 				},
 		        error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); }
 		    });
-			
+			*/
 		}
 		
 	}
\ No newline at end of file

From d56173e860fb5334209fc7d0f6e3db67d2c6dae3 Mon Sep 17 00:00:00 2001
From: hylee <hehihoho3@gmail.com>
Date: Fri, 30 Sep 2022 12:38:07 +0900
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=EC=B2=B4=ED=97=98=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0=20=EB=AA=A9=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/web/kccadr/adjstExp/adjstIncidentList.jsp  |  2 +-
 .../web/kccadr/adjstExp/adjstReqRegistStep3.jsp    | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp
index 16bb4998..3fdf1368 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp
@@ -104,7 +104,7 @@
 <div class="cont_wrap sub02_1" id="sub">
 	<div class="inner">
 		<div class="cont_tit">
-			<h2>[체험] 조정사건 목록</h2>
+			<h2>[체험] 조정사건 목록<c:out value="${adjstIncidentVO.searchStatus = null ? 'A' : adjstIncidentVO.searchStatus}" /></h2>
 		</div>
 
 		<!-- list_top -->
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp
index c939bc27..10805f13 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp
@@ -79,6 +79,14 @@ $( document ).ready(function(){
 	
 });
 
+function fncGoList(status) {
+	var linkForm = document.expGoDetail;
+	linkForm.searchStatus.value = status;
+	linkForm.action = "<c:url value='/web/kccadr/adjstExp/adjstIncidentList.do'/>";
+	linkForm.submit();
+}
+
+
 </script>
 </head>
 <body>
@@ -212,7 +220,7 @@ $( document ).ready(function(){
 		<div class="btn_wrap btn_layout03">
  			<div class="btn_left"><!--<button type="button" class="btnType04 btn_move" onclick="AdjstReq.fncGoPrev();">2단계이동</button>--></div> 
 			<div class="btn_right">
-				<button type="button" class="btnType02 btn_save" onClick="AdjstReq.step3Save('<c:out value='${KccadrConstants.ADR_MODE_SMT}' />'); return false;">조정신청서 제출</button>
+				<button type="button" class="btnType02 btn_save" onClick="fncGoList(''); return false;">조정신청서 제출</button>
 			</div>
 		</div>
 		<!-- //하단 버튼 -->
@@ -220,7 +228,9 @@ $( document ).ready(function(){
 </div>
 <!-- //cont -->
 </form:form>
-<form name="expGoDetail" id="expGoDetail" action="<c:url value='/web/kccadr/adjstExp/adjstIncidentList.do'/>">
+
+<form name="expGoDetail" id="expGoDetail"  method="post" action="<c:url value='/web/kccadr/adjstExp/adjstIncidentList.do'/>">
+    <input type="hidden" name="searchStatus" value="" />
 <%-- 	<input type="hidden" name="adrSeq" id="adrSeq" value="${adjstReqVO.adrSeq }"/> --%>
 <%-- 	<input type="hidden" name="adrSn" id="adrSn" value="${adjstReqVO.adrSn }"/> --%>
 </form>