From eb344102a3e614b3828404df8e9a2be315906032 Mon Sep 17 00:00:00 2001
From: hylee <hehihoho3@gmail.com>
Date: Mon, 14 Nov 2022 10:20:27 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=EC=B2=B4=ED=97=98=ED=95=98=EA=B8=B0?=
 =?UTF-8?q?=20>=20=ED=95=98=EB=8B=A8=20=EC=9E=84=EC=8B=9C=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=EB=B0=8F=20=EC=9D=B4=EC=A0=84=EB=8B=A8=EA=B3=84?=
 =?UTF-8?q?=EC=9D=B4=EB=8F=99=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kcc/kccadr/adjstExp/web/AdjstExpController.java  | 12 ++++++++++--
 .../jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp  | 10 +++++++++-
 .../jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp  | 12 +++++++++---
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java
index f803a328..649039e0 100644
--- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java
+++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java
@@ -227,8 +227,11 @@ public class AdjstExpController {
 		adjstReqVO.setStep(KccadrConstants.STEP7);
 
 		// 신청인 , 대리인 목록 초기화
-		List<AdjstReqVO> list = null;
+		List<AdjstReqVO> list = new ArrayList<>();
 
+		/*
+		System.out.println("adjstReqVO.getRpplTy() :: "+ adjstReqVO.getRpplTy());
+		
 		// 조정일련번호와 카피 조정일련번호가 있다면 수정상태로 본다..
 		if(StringUtils.isNotBlank(adjstReqVO.getAdrSeq()) || StringUtils.isNotBlank(adjstReqVO.getCopyAdrSeq())){
 
@@ -267,7 +270,12 @@ public class AdjstExpController {
 				list.add(req);
 			}
 		}
-		model.addAttribute("list", list); // 조정사건폼
+		*/
+		// 기존 화면 로직을 따르기 위한 처리
+			AdjstReqVO req = new AdjstReqVO();	// 신청인
+			req.setRpplTy(KccadrConstants.ADR_RPPL_TY_REQ);
+			list.add(req);
+			model.addAttribute("list", list); // 조정사건폼
 		return "/web/kccadr/adjstExp/adjstReqRegistStep1";
 	}
 	
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp
index cb0c4c47..fe8c697c 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp
@@ -78,6 +78,14 @@
 	   		}
 	    	
 	    });
+	    
+
+	    $('.btn_move').click(function(){
+
+			document.STEP8.action = "/web/kccadr/adjstExp/adjstReqRegistStep1.do";
+			document.STEP8.submit();
+	    });
+	    
 
 	});
 </script>
@@ -500,7 +508,7 @@
 		</c:choose>
 		<!-- 하단 버튼 -->
 		<div class="btn_wrap btn_layout03">
-			<div class="btn_left"><!-- <button type="button" class="btnType04 btn_move" onclick="AdjstReq.fncGoPrev();">1단계 이동</button> --></div>
+			<div class="btn_left"><button type="button" class="btnType04 btn_move">1단계 이동</button></div>
 			<c:choose>
 				<c:when test="${fn:length(list) eq 0}">
 				
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 78696673..b7da4542 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
@@ -83,12 +83,18 @@ $( document ).ready(function(){
    		{
         	if(confirm("신청인 취지/원인 정보 임시저장이 완료되었습니다.\n다음 페이지로 이동하시겠습니까?"))
        		{
-				document.STEP9.action = "/web/kccadr/adjstExp/adjstReqRegistStep3.do";
-				document.STEP9.submit();
+// 				document.STEP9.action = "/web/kccadr/adjstExp/adjstIncidentList.do";
+	            expGoDetail.submit();
        		}
    		}
     	
     });
+    
+    $('.btn_move').click(function(){
+
+		document.STEP9.action = "/web/kccadr/adjstExp/adjstReqRegistStep2.do";
+		document.STEP9.submit();
+    });
 	
 });
 
@@ -231,7 +237,7 @@ function fncGoList(status) {
 		</div>
 		<!-- 하단 버튼 -->			
 		<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_left"><button type="button" class="btnType04 btn_move" onclick="AdjstReq.fncGoPrev();">2단계이동</button></div>
 			<div class="btn_right">
 				<button type="button" class="btnType01 insert temporaryBtn">임시저장</button>
 				<button type="button" class="btnType02 btn_save" onClick="fncGoList(''); return false;">조정신청서 제출</button>