Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/kcc_adr_advc_git

src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java

@@ -281,11 +281,12 @@ public class ApmController {
         cmmVO.setLastIndex(paginationInfo.getLastRecordIndex());
         cmmVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
         
+        cmmVO.setReqOlCdPst("2");
+        
         paginationInfo.setTotalRecordCount(cmmService.selectPgrCmmListCnt(cmmVO));
         model.addAttribute("paginationInfo", paginationInfo);
 
         // reqOlCdPst 값이 있으면 과거사건 조회하지 않음
-        cmmVO.setReqOlCdPst("2");
         model.addAttribute("list", cmmService.selectPgrCmmList(cmmVO));
         
         

src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java

@@ -131,6 +131,8 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable {
     private String assSeq0;
     private String assSeq1;
     private String assSeq2;
+    
+    private String assSeq2SelectYn;
 
     private String addUsrNm0;
     private String addUsrNm1;
@@ -1154,6 +1156,16 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable {
 	public void setReqOlCdPst(String reqOlCdPst) {
 		this.reqOlCdPst = reqOlCdPst;
 	}
+
+	public String getAssSeq2SelectYn() {
+		return assSeq2SelectYn;
+	}
+
+	public void setAssSeq2SelectYn(String assSeq2SelectYn) {
+		this.assSeq2SelectYn = assSeq2SelectYn;
+	}
+	
+	
 	
 
 

src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java

@@ -12,6 +12,7 @@ import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -37,6 +38,7 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO;
 import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService;
 import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO;
 import kcc.kccadr.adjPgrMgr.dnt.service.DntService;
+import kcc.kccadr.adjPgrMgr.dnt.service.DntVO;
 import kcc.kccadr.adjPgrMgr.drt.service.AgntVO;
 import kcc.kccadr.adjPgrMgr.drt.service.AssVO;
 import kcc.kccadr.adjPgrMgr.drt.service.DrtService;
@@ -112,6 +114,10 @@ public class DrtController {
     
 	@Resource(name = "egovCryptoUtil")
  	private EgovCryptoUtil egovCryptoUtil;
+	
+	//조정사건 이력관리 일련번호
+	@Resource(name="adrHstryMgrSeqGnrService")
+	private EgovIdGnrService adrHstryMgrSeqGnrService;
     
 	// 실서버 개발서버 구분
 	private static String islocal;	//	/pdf/out/
@@ -129,6 +135,9 @@ public class DrtController {
     @RequestMapping(value = "drtReg.do")
     public String drtReg(PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception {
 
+    	//조정부장 ass_seq select 여부
+    	cmmVO.setAssSeq2SelectYn("Y");
+    	
         // drtService.selectAssList(cmmVO); //수정용
         List<AssVO> assList = drtService.selectAssRegList(drtVO);
         model.addAttribute("assList", assList);
@@ -243,7 +252,6 @@ public class DrtController {
         drtVO.setFrstRegisterId(userId);
         drtVO.setLastUpdusrId(userId);
 
-
         /*
         String statCd = KccadrConstants.ADR_KJOSU_APPR_COMP; // = "302050"; // 기일조서 결재완료
 
@@ -264,11 +272,21 @@ public class DrtController {
         		, ""
         		);        
         
+        ///이력관리를 위한 adr_hstry_mgr_detail -	2022-09-07	controller	#1	
+        String s_adrHstryMgrSeq	=	adrHstryMgrSeqGnrService.getNextStringId();
+        
+        DntVO dntVO = new DntVO();
+        BeanUtils.copyProperties(drtVO, dntVO);
         
         //대석 등록
-        dntService.updateDistribution2(drtVO
+        /*dntService.updateDistribution2(dntVO
         		, "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정"	//String p_code_desc	-	CC199
-        		, "A450"	//String p_stat_cd 			        		
+        		, "A450"	//String p_stat_cd  
+        		);*/
+        dntService.updateDistribution(dntVO
+        		, "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정"	//String p_code_desc	-	CC199
+        		, "A450"	//String p_stat_cd 	
+        		, s_adrHstryMgrSeq
         		);
 
         /*
@@ -300,6 +318,9 @@ public class DrtController {
     @RequestMapping(value = "drtDetail.do")
     public String drtDetail(PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception {
 
+    	//조정부장 ass_seq select 여부
+    	cmmVO.setAssSeq2SelectYn("Y");
+    	
         List<AssVO> assList = drtService.selectAssList(drtVO);
 
         PgrCmmVO info = cmmService.selectPgrCmm(cmmVO);
@@ -356,11 +377,30 @@ public class DrtController {
         		, ""
         		);
         
-        //대석 등록
+//        //대석 등록
-        dntService.updateDistribution2(drtVO
+//        dntService.updateDistribution2(drtVO
-        		, "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정"	//String p_code_desc	-	CC199
+//        		, "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정"	//String p_code_desc	-	CC199
-        		, "A450"	//String p_stat_cd 			        		
+//        		, "A450"	//String p_stat_cd 			        		
-        		);
+//        		);
+        
+        
+        ///이력관리를 위한 adr_hstry_mgr_detail -	2022-09-07	controller	#1	
+	    String s_adrHstryMgrSeq	=	adrHstryMgrSeqGnrService.getNextStringId();
+	    
+	    DntVO dntVO = new DntVO();
+	    BeanUtils.copyProperties(drtVO, dntVO);
+	    
+	    //대석 등록
+	    /*dntService.updateDistribution2(dntVO
+	    		, "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정"	//String p_code_desc	-	CC199
+	    		, "A450"	//String p_stat_cd  
+	    		);*/
+	    dntService.updateDistribution(dntVO
+	    		, "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정"	//String p_code_desc	-	CC199
+	    		, "A450"	//String p_stat_cd 	
+	    		, s_adrHstryMgrSeq
+	    		);
+	    
 
         modelAndView.addObject("result", "success");
 

src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java

@@ -137,6 +137,7 @@ public class AdjClsMgrController {
 		
 		String searchWrd =  (String) commandMap.get("q");
 		
+		log.info(" + searchWrd ::  [{}]", searchWrd);
 		if (searchWrd!= null && !("").equals(searchWrd)) {
 			searchService.search(commandMap, model);
 		}
@@ -144,12 +145,10 @@ public class AdjClsMgrController {
 		PaginationInfo paginationInfo = new PaginationInfo();
 		int totalRecordCount = 0;
 		
-		log.info(" + commandMap :: [{}]", commandMap);
 		
 		String rangeView = (String)commandMap.get("rangeView");
 		if ( StringUtils.isNotBlank(rangeView) ) {
 			Map<String, Long> resultCntMap = (Map<String, Long>)model.get("resultCntMap");
-			log.debug("resultCntMap : {}", resultCntMap);
 			Long total = resultCntMap.get(rangeView);
 			if (total != null) {
 				totalRecordCount = total.intValue();
@@ -168,6 +167,15 @@ public class AdjClsMgrController {
 			paginationInfo.setTotalRecordCount(totalRecordCount);
 			model.addAttribute("paginationInfo", paginationInfo);
 		}
+
+		String q = (String) commandMap.get("q");
+		if(q.length() == 1 && ":".equals(q))
+		{
+			commandMap.put("q", "");
+		}
+		
+		
+		model.addAttribute("commandMap", commandMap);
 		model.addAttribute("totalRecordCount", totalRecordCount);
 
 		return "/kccadr/adjclsmgr/adjCloseMangeList";

src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java

@@ -1551,11 +1551,10 @@ public class AdjstReqWebController {
 	public String adjstReqReport(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model, RedirectAttributes redirectAttributes, HttpServletRequest req) throws Exception {
 		
 		//로그인 권한정보 불러오기
-    	LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
+		// 체험하기 조정신청 3Step의 미리보기를 위함 login 체크 제거
-    	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
+		//
-		//System.out.println("adjstReqVO.getAdrSeq()");
+//    	LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
-		//System.out.println(adjstReqVO.getAdrSeq());
+//    	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
-		//String userId = "123";
     	
     	AdjstReqVO adjstMsrMasterVO = new AdjstReqVO();
     	//adjstMsrMasterVO.setAdrSeq("ADR_0000000000000381");
@@ -1565,8 +1564,9 @@ public class AdjstReqWebController {
     	JSONObject jsReqInfo = new JSONObject();
     	JSONArray jsRespInfo = new JSONArray();
     	JSONArray jsAtchFileInfo = new JSONArray();
-    	
+
-    	if(!userId.equals("")) {
+		// 체험하기 조정신청 3Step의 미리보기를 위함 login 체크 제거
+//    	if(!userId.equals("")) {
     		
     		//임시 저장중인 데이터가 있는지 확인 
     		//조정사건 번호 조회하기
@@ -1646,7 +1646,7 @@ public class AdjstReqWebController {
     			
     		}
     		
-    	}
+//    	}
     	
     	
     	JSONObject jsObjData = new JSONObject();

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

src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java

@@ -13,6 +13,8 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.annotation.Resource;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.math.NumberUtils;
@@ -35,6 +37,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.ui.ModelMap;
 
 import kcc.let.solr.search.service.SearchService;
+import kcc.let.utl.fcc.service.EgovCryptoUtil;
 
 public class SearchServiceImpl implements InitializingBean, SearchService {
 
@@ -42,6 +45,10 @@ public class SearchServiceImpl implements InitializingBean, SearchService {
 
 	@Value("${Globals.Solr.url}")
 	private String SERVER_URL;
+
+	//암복호화 유틸
+	@Resource(name = "egovCryptoUtil")
+	EgovCryptoUtil egovCryptoUtil;
 	
 	private Set<String> introFieldSet;
 	private Set<String> policyFieldSet;
@@ -151,8 +158,8 @@ public class SearchServiceImpl implements InitializingBean, SearchService {
 		Map<String, Long> resultCntMap = new HashMap<String, Long>();
 		long totalCount = 0;
 		for (SOLR_CORE sc : SOLR_CORE.values()) {
-			
+
-			
+			log.info(" + sc.getValue() :: [{}]", sc.getValue()); 
 			resultCntMap.put(sc.getValue(), new Long(0));
 			resultMap.put(sc.getValue(), Collections.<Map<String, Object>>emptyList());
 			List<Map<String, Object>> resultList = getResultList(sc, fieldMap.get(sc.getValue()), commandMap);
@@ -168,8 +175,9 @@ public class SearchServiceImpl implements InitializingBean, SearchService {
 			if ( sc.getValue().equals((String)commandMap.get("rangeView")) ) {
 			}
 		}
+		
+		
 		model.addAttribute("resultMap", resultMap);
-		log.info("resultMap :: [{}]", resultMap);
 		model.addAttribute("resultCntMap", resultCntMap);
 		model.addAttribute("totalCount", totalCount);
 
@@ -219,7 +227,16 @@ public class SearchServiceImpl implements InitializingBean, SearchService {
 		} finally {
 			IOUtils.closeQuietly(client);
 		}
-		log.debug(" :: resultList :: [{}]", resultList);
+		
+		resultList.forEach(t-> {
+			t.put("resPonDentNm", egovCryptoUtil.decrypt((String) t.get("resPonDentNm"))); 
+			t.put("appliCantNm", egovCryptoUtil.decrypt((String) t.get("appliCantNm"))); 
+		});
+		
+		
+//		log.debug(" :: resultList :: [{}]", resultList);
+		
+		
 		return resultList;
 	}
 

src/main/resources/egovframework/spring/com/context-common.xml

@@ -94,7 +94,7 @@
 		<property name="searchFieldSet"> <!-- 전자조정 -->
 			<set>
 				<value>adrSeq</value>
-				<value>adrNo </value>
+				<value>adrNo</value> 
 				<value>statCd</value>
 				<value>reqOlCd</value>
 				<value>reqCn1</value>

src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml

@@ -153,10 +153,24 @@
            
 	       , D.MEM_DEPT_SEQ                                AS memDeptSeq /* 조정부 */
 	       , DM.MEM_DEPT_NM                                AS memDeptNm /* 조정부명 */
-	       , DMN.MEM_NAME								   AS memName /* 조정부장명 */
+	       , ( SELECT  AMM.MEM_NAME SEPARATOR
-	       , DMN.MEM_SEQ								   AS memSeq  /* 조정부장 일련번호*/
+		       FROM     ADR_ASS_MGR S1
-
+		                LEFT JOIN ADR_MEM_MGR AMM
-
+		                ON       S1.ADD_USR_ID = AMM.MEM_SEQ
+		       WHERE    S1.ADR_SEQ             = M.ADR_SEQ
+		       AND      S1.ADR_SN              = '1'
+		       AND      S1.ASS_USR_TY          = '01'
+		       LIMIT 1
+		       ) AS memName /* 조정부장명 */
+	       , ( SELECT AMM.MEM_SEQ SEPARATOR
+		       FROM     ADR_ASS_MGR S1
+		                LEFT JOIN ADR_MEM_MGR AMM
+		                ON       S1.ADD_USR_ID = AMM.MEM_SEQ
+		       WHERE    S1.ADR_SEQ             = M.ADR_SEQ
+		       AND      S1.ADR_SN              = '1'
+		       AND      S1.ASS_USR_TY          = '01'
+		       LIMIT 1
+		       ) AS memSeq  /* 조정부장 일련번호*/
 	       , (   SELECT GROUP_CONCAT ( AMM.MEM_NAME SEPARATOR ', ' )
 		           FROM ADR_ASS_MGR S1
 		               LEFT JOIN ADR_MEM_MGR AMM ON S1.ADD_USR_ID = AMM.MEM_SEQ
@@ -183,9 +197,16 @@
                     AND S1.ASS_USR_TY                             = '02'
                GROUP BY S1.ADR_SEQ, ADR_SN
                ORDER BY S1.ADD_USR_ID ) AS assSeqes /* 조정위원들배석일련벉호 */
-
+           , ( SELECT  NVL(S1.ASS_SEQ, '')
-
+		       FROM     ADR_ASS_MGR S1
-
+		                LEFT JOIN ADR_MEM_MGR AMM
+		                ON       S1.ADD_USR_ID = AMM.MEM_SEQ
+		       WHERE    S1.ADR_SEQ             = M.ADR_SEQ
+		       AND      S1.ADR_SN              = '1'
+		       AND      S1.ASS_USR_TY          = '01'
+		       limit 1
+		       ) AS assSeq2
+		       /* 조정부장일련번호 */
 	       , D.ADR_ADM_ID                                  AS adrAdmId /* 조정조사관ID */
 	       , AU.USER_NM                                    AS adrAdmNm /* 조정조사관명 */
 	       , AU.OFFM_TELNO                                 AS adrAdmOffmTel /* 조정조사관 내선번호 */

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp

@@ -701,7 +701,11 @@
                                 <tr>
                                     <th>조정부장</th>
                                     <td colspan="3">
-                                        <c:out value="${info.memName }" />
+<%--                                         <c:out value="${info.memName }" /> --%>
+										<input type="text" size="30" id="addUsrNm2" value="${info.memName}" readonly="readonly" />&nbsp;
+										<c:if test="${!empty info.memName}">
+                                            <button type="button" class="btnType01 btn_overlap" onclick="srcAss(2)">대석</button>
+                                        </c:if>
                                     </td>
                                 </tr>
                                 <%-- <tr>

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp

@@ -507,7 +507,11 @@
                                 <tr>
                                     <th>조정부장</th>
                                     <td colspan="3">
-                                        <c:out value="${info.memName }" />
+<%--                                         <c:out value="${info.memName }" /> --%>
+                                        <input type="text" size="30" id="addUsrNm2" value="${info.memName}" readonly="readonly" />&nbsp;
+                                        <c:if test="${!empty info.memName}">
+                                            <button type="button" class="btnType01 btn_overlap" onclick="srcAss(2)">대석</button>
+                                        </c:if>
                                     </td>
                                 </tr>
                                 <%-- <tr>

src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp

@@ -29,6 +29,9 @@
     function linkPage(pageNo){
         var listForm = document.listForm ;
         listForm.pageIndex.value = pageNo ;
+        var q1 = form.q1.value;
+        if(q1 == "") q1 = ":"
+        listForm.q.value = q1 ;
         listForm.action = "<c:url value='/kccadr/adjclsmgr/adjCloseMangeList.do'/>";
         listForm.submit();
     }
@@ -53,14 +56,18 @@
 </script>
 </head>
 <body>
-<form:form id="listForm" name="listForm" commandName="adjClsMgrVO" onsubmit="return false;" method="post">
+<form id="listForm" name="listForm" onsubmit="return false;" method="post">
-<%-- <input type="hidden" name="pageIndex" value="<c:out value='${adjClsMgrVO.pageIndex}' default='1' />"/> --%>
+	<%-- <input type="hidden" name="pageIndex" value="<c:out value='${adjClsMgrVO.pageIndex}' default='1' />"/> --%>
-<%-- <input type="hidden" name="searchSortCnd" value="<c:out value="${adjClsMgrVO.searchSortCnd}" />" /> --%>
+	<input type="hidden" name="pageIndex" value="<c:out value='${paginationInfo.currentPageNo}' default='1' />"/>
-<%-- <input type="hidden" name="searchSortOrd" value="<c:out value="${adjClsMgrVO.searchSortOrd}" />" /> --%>
+	<input type="hidden" name="rangeView" value="kcc_adr_advc" />
-<%-- <input type="hidden" name="searchStatus" value="<c:out value="${adjClsMgrVO.searchStatus}" />" /> --%>
+	<input type="hidden" name="q" id="q" value="" />
-<input type="hidden" name="adrSeq" value="" />
+	<%-- <input type="hidden" name="searchSortCnd" value="<c:out value="${adjClsMgrVO.searchSortCnd}" />" /> --%>
-<input type="hidden" name="adrSn" value="" />
+	<%-- <input type="hidden" name="searchSortOrd" value="<c:out value="${adjClsMgrVO.searchSortOrd}" />" /> --%>
-
+	<%-- <input type="hidden" name="searchStatus" value="<c:out value="${adjClsMgrVO.searchStatus}" />" /> --%>
+	<input type="hidden" name="adrSeq" value="" />
+	<input type="hidden" name="adrSn" value="" />
+</form>
+<form:form id="form" name="form" commandName="adjClsMgrVO" onsubmit="return false;" method="post">
 <!-- cont -->
 <div class="cont_wrap">
     <div class="box">
@@ -81,7 +88,8 @@
                 <div class="list_util">
                     <div class="detail_search">
                         <ul>
-							<p>name="q" 검색어 : <input type="text" name="q" value=":"/></p>
+<%-- 
+							<p>name="q" 검색어 : <input type="text" id="q1" name="q1" value=":"/></p>
 							<p>name="rangeView" 카테고리 : <input type="text" name="rangeView" value="kcc_adr_advc"/></p>
                             <li>
                                 <p class="tit_text">구분${adjClsMgrVO.searchCondition}</p>
@@ -117,6 +125,11 @@
                                 </div>
                                 <button class="btn_search" onclick="fncGoList(); return false;">검색</button>
                             </li>
+ --%>
+                            <li>
+                            	<p class="tit_text">검색어</p><input type="text" id="q1" name="q1" value="<c:out value="${commandMap.q }" />"/>
+                                <button class="btn_search" onclick="fncGoList(); return false;">검색</button>
+                            </li>
                         </ul>
                     </div>
                 </div>
@@ -152,86 +165,87 @@
                     </tr>
                     </thead>
                     <tbody>
-<%--                     <c:forEach var="list" items="${list}" varStatus="status"> --%>
+						<c:forEach var="list" items="${resultMap.kcc_adr_advc }" varStatus="status">
-<!--                         <tr> -->
+							<tr>
-<!--                             <td class="td_num"> -->
+								<td class="td_num">
-<%--                                 <p><c:out value="${list.sbmtDe}"/></p> --%>
+									<p>
-<!--                             </td> -->
+										<c:out value="${list.sbmtDe}" />
-<!--                             <td class="td_date"> -->
+									</p>
-<%--                             	<c:choose> --%>
+								</td>
-<%--                             		<c:when test="${list.reqOlCd ne '2' }"> --%>
+								<td class="td_date"><c:choose>
-<%--                                 		<a href="#none" onclick="fncGoDetail('${list.adrSeq}', '${list.adrSn}');">${empty list.adrNo ? '-' : list.adrNo}</a> --%>
+										<c:when test="${list.reqOlCd ne '2' }">
-<%--                                 	</c:when> --%>
+											<a href="#none" onclick="fncGoDetail('${list.adrSeq}', '${list.adrSn}');">${empty list.adrNo ? '-' : list.adrNo}</a>
-<%--                             		<c:when test="${list.reqOlCd eq '2' }"> --%>
+										</c:when>
-<%--                                 		<a href="#none" onclick="fncGoPastDetail('${list.adrSeq}', '${list.adrSn}');">${empty list.adrNo ? '-' : list.adrNo}</a> --%>
+										<c:when test="${list.reqOlCd eq '2' }">
-<%--                            			</c:when> --%>
+											<a href="#none" onclick="fncGoPastDetail('${list.adrSeq}', '${list.adrSn}');">${empty list.adrNo ? '-' : list.adrNo}</a>
-<%--                                 </c:choose>  --%>
+										</c:when>
-<!--                             </td> -->
+									</c:choose>
-<!--                             <td class="td_subscriber"> -->
+								</td>
-<%--                             	<c:choose> --%>
+								<td class="td_subscriber">
-<%--                             		<c:when test="${list.reqOlCd ne '2' }"> --%>
+	                            	<c:choose>
-<%--                                 		<a href="#none" onclick="fncGoDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.appliCantNm}"/></a> --%>
+	                            		<c:when test="${list.reqOlCd ne '2' }">
-<%--                                 	</c:when> --%>
+	                                		<a href="#none" onclick="fncGoDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.appliCantNm}"/></a>
-<%--                             		<c:when test="${list.reqOlCd eq '2' }"> --%>
+	                                	</c:when>
-<%--                                 		<a href="#none" onclick="fncGoPastDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.appliCantNm}"/></a> --%>
+	                            		<c:when test="${list.reqOlCd eq '2' }">
-<%--                            			</c:when> --%>
+	                                		<a href="#none" onclick="fncGoPastDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.appliCantNm}"/></a>
-<%--                                 </c:choose>  --%>
+	                           			</c:when>
-<!--                             </td> -->
+	                                </c:choose> 
-<!--                             <td class="td_respondent"> -->
+	                            </td>
-<%--                             	<c:choose> --%>
+	                            <td class="td_respondent">
-<%--                             		<c:when test="${list.reqOlCd ne '2' }"> --%>
+	                            	<c:choose>
-<%--                                 		<a href="#none" onclick="fncGoDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.resPonDentNm}"/></a> --%>
+	                            		<c:when test="${list.reqOlCd ne '2' }">
-<%--                                 	</c:when> --%>
+	                                		<a href="#none" onclick="fncGoDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.resPonDentNm}"/></a>
-<%--                             		<c:when test="${list.reqOlCd eq '2' }"> --%>
+	                                	</c:when>
-<%--                                 		<a href="#none" onclick="fncGoPastDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.resPonDentNm}"/></a> --%>
+	                            		<c:when test="${list.reqOlCd eq '2' }">
-<%--                            			</c:when> --%>
+	                                		<a href="#none" onclick="fncGoPastDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.resPonDentNm}"/></a>
-<%--                                 </c:choose>  --%>
+	                           			</c:when>
-<!--                             </td> -->
+	                                </c:choose> 
-<!--                             <td class="td_deputy"> -->
+	                            </td>
-<%--                             	<c:choose> --%>
+	                            <td class="td_deputy">
-<%--                             		<c:when test="${list.reqOlCd ne '2' }"> --%>
+	                            	<c:choose>
-<%--                                 <a href="#none" onclick="fncGoDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.ccTy}"/></a> --%>
+	                            		<c:when test="${list.reqOlCd ne '2' }">
-<%--                                 		<a href="#none" onclick="fncGoDetail('${list.adrSeq}', '${list.adrSn}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a> --%>
+	                                <a href="#none" onclick="fncGoDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.ccTy}"/></a>
-<%--                                 	</c:when> --%>
+	                                		<a href="#none" onclick="fncGoDetail('${list.adrSeq}', '${list.adrSn}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a>
-<%--                             		<c:when test="${list.reqOlCd eq '2' }"> --%>
+	                                	</c:when>
-<%--                                 		<a href="#none" onclick="fncGoPastDetail('${list.adrSeq}', '${list.adrSn}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a> --%>
+	                            		<c:when test="${list.reqOlCd eq '2' }">
-<%--                            			</c:when> --%>
+	                                		<a href="#none" onclick="fncGoPastDetail('${list.adrSeq}', '${list.adrSn}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a>
-<%--                                 </c:choose>  --%>
+	                           			</c:when>
-<!--                             </td> -->
+	                                </c:choose> 
-<!--                             <td class=""> -->
+	                            </td>
-<%--                                 <p><c:out value="${empty list.memDeptNm ? '-' : list.memDeptNm}"/></p> --%>
+	                            <td class="">
-<!--                             </td> -->
+	                                <p><c:out value="${empty list.memDeptNm ? '-' : list.memDeptNm}"/></p>
-<!--                             <td class=""> -->
+	                            </td>
-<%--                                 <p><c:out value="${empty list.adrAdmNm ? '-' : list.adrAdmNm}"/></p> --%>
+	                            <td class="">
-<!--                             </td> -->
+	                                <p><c:out value="${empty list.adrAdmNm ? '-' : list.adrAdmNm}"/></p>
-<!--                             <td class=""> -->
+	                            </td>
-<%--                                 <p><c:out value="${empty list.lastUpdtPnttm ? '-' : list.lastUpdtPnttm}"/></p> --%>
+	                            <td class="">
-<!--                             </td> -->
+	                                <p><c:out value="${empty list.lastUpdtPnttm ? '-' : list.lastUpdtPnttm}"/></p>
-                            
+	                            </td>
-<!--                             <td class="td_status"> -->
+
-<!-- 	                            송달정보가 있으면 조회, 없으면 입력 버튼 노출 -->
+								<td class="td_status">
-<%-- 	                            <c:choose>	                    --%>
+									<!-- 송달정보가 있으면 조회, 없으면 입력 버튼 노출 -->
-<%-- 	                            	<c:when test="${list.finalStatCd eq '304050'}"> --%>
+									<c:choose>
-<!-- 	                            		조정조서종결 -->
+										<c:when test="${list.finalStatCd eq '304050'}">
-<%-- 	                            	</c:when> --%>
+											조정조서종결
-<%-- 	                            	<c:when test="${list.finalStatCd eq '305050'}"> --%>
+										</c:when>
-<!-- 	                            		취하종결 -->
+										<c:when test="${list.finalStatCd eq '305050'}">
-<%-- 	                            	</c:when> --%>
+											취하종결
-<%-- 	                            	<c:when test="${list.finalStatCd eq '307050'}"> --%>
+										</c:when>
-<!-- 	                            		불성립종결 -->
+										<c:when test="${list.finalStatCd eq '307050'}">
-<%-- 	                            	</c:when> --%>
+											불성립종결
-<%-- 	                            	<c:when test="${list.finalStatCd eq '306050'}"> --%>
+										</c:when>
-<!-- 	                            		직권조정 성립 -->
+										<c:when test="${list.finalStatCd eq '306050'}">
-<%-- 	                            	</c:when> --%>
+											직권조정 성립
-<%-- 	                            	<c:otherwise> --%>
+										</c:when>
-<!-- 	                            		- -->
+										<c:otherwise>
-<%-- 	                            	</c:otherwise> --%>
+											-
-<%-- 	                            </c:choose>                             --%>
+										</c:otherwise>
-<!--                             	<kc:code codeId="CC013" code="${list.finalStatCd}"/> -->
+									</c:choose>
-<!--                             </td> -->
+<%-- 								<kc:code codeId="CC013" code="${list.finalStatCd}"/> --%>
-<!--                         </tr> -->
+	                            </td>
-<%--                     </c:forEach> --%>
+	                        </tr>
-                    <c:if test="${empty list}">
+						</c:forEach>
+                    <c:if test="${empty resultMap}">
                         <tr><td colspan="9"><spring:message code="common.nodata.msg" /></td></tr>
                     </c:if>
                     </tbody>

src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList_backup.jsp

@@ -0,0 +1,259 @@
+<%@ page contentType="text/html; charset=utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<!DOCTYPE html>
+<html lang="ko">
+<head>
+<title>조정사건 목록</title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<script type="text/javaScript" language="javascript">
+	$(document).ready(function() {
+		//해당 페이지에 대한 권한 체크
+		_admin_fn_check_authority("adjCloseMangeList", "div.cont", "ALL");
+	});
+
+	//권한 체크 결과값으로 후속처리
+	function admin_fn_check_authority_ret(p_param){
+		//alert(p_param);	//리턴값으로 상세 권한 체크시 사용 "" 또는 CUD 또는 CUDP
+	}
+	
+    function fncGoList(){
+        linkPage(1);
+    }
+
+    function linkPage(pageNo){
+        var listForm = document.listForm ;
+        listForm.pageIndex.value = pageNo ;
+        listForm.action = "<c:url value='/kccadr/adjclsmgr/adjCloseMangeList.do'/>";
+        listForm.submit();
+    }
+
+    function fncGoDetail(adrSeq, adrSn){
+        var listForm = document.listForm ;
+        listForm.adrSeq.value = adrSeq;
+        listForm.adrSn.value = adrSn;
+        listForm.action = "<c:url value='/kccadr/adjclsmgr/adjCloseMangeDetail.do'/>";
+        listForm.submit();
+    }
+
+    function fncGoPastDetail(adrSeq, adrSn){
+        var listForm = document.listForm ;
+        listForm.adrSeq.value = adrSeq;
+        listForm.adrSn.value = adrSn;
+        listForm.action = "<c:url value='/kccadr/adjReqMgOff/adjReqMgrPastDetail.do'/>";
+        listForm.submit();
+    }
+
+
+</script>
+</head>
+<body>
+<form:form id="listForm" name="listForm" commandName="adjClsMgrVO" onsubmit="return false;" method="post">
+<%-- <input type="hidden" name="pageIndex" value="<c:out value='${adjClsMgrVO.pageIndex}' default='1' />"/> --%>
+<%-- <input type="hidden" name="searchSortCnd" value="<c:out value="${adjClsMgrVO.searchSortCnd}" />" /> --%>
+<%-- <input type="hidden" name="searchSortOrd" value="<c:out value="${adjClsMgrVO.searchSortOrd}" />" /> --%>
+<%-- <input type="hidden" name="searchStatus" value="<c:out value="${adjClsMgrVO.searchStatus}" />" /> --%>
+<input type="hidden" name="adrSeq" value="" />
+<input type="hidden" name="adrSn" value="" />
+
+<!-- cont -->
+<div class="cont_wrap">
+    <div class="box">
+        <!-- cont_tit -->
+        <div class="cont_tit">
+            <h2>조정종결목록</h2>
+            <ul class="cont_nav">
+                <li class="home"><a href="/"><i></i></a></li>
+                <li>
+                    <p>조정종결관리</p>
+                </li>
+                <li><span class="cur_nav">조정종결목록</span></li>
+            </ul>
+        </div>
+        <div class="cont">
+            <!-- list_top -->
+            <div class="list_top">
+                <div class="list_util">
+                    <div class="detail_search">
+                        <ul>
+							<p>name="q" 검색어 : <input type="text" name="q" value=":"/></p>
+							<p>name="rangeView" 카테고리 : <input type="text" name="rangeView" value="kcc_adr_advc"/></p>
+                            <li>
+                                <p class="tit_text">구분${adjClsMgrVO.searchCondition}</p>
+                                <select name="searchCondition" id="searchCondition">
+                                    <option value="1" ${adjClsMgrVO.searchCondition eq '1' ? 'selected' : '' }>조정번호</option>
+                                    <option value="2" ${adjClsMgrVO.searchCondition eq '2' ? 'selected' : '' }>조정조사관</option>
+                                    <option value="3" ${adjClsMgrVO.searchCondition eq '3' ? 'selected' : '' }>조정부</option>
+                                </select>
+                                <input type="text" id=searchKeyword name="searchKeyword" class="search_input" placeholder="검색어를 입력하세요" value="<c:out value='${adjClsMgrVO.searchKeyword}'/>">
+                            </li>
+                            <li>
+                            	<p class="tit_text">종결일자</p>
+                            	<div id="sel_date" class="sel_date">
+		                           	<div class="calendar_wrap">
+										<input type="text" class="startDate inp" title="검색시작일" id="startDate01" name="searchStartDt" value="${adjClsMgrVO.searchStartDt}" data-datecontrol="true" readonly>
+										<div class="calendar_in" id="calendarName_startDate" style="z-index: 9;">
+	                                        <button type="button" value="달력 팝업 열기" onclick="return calendarOpen('startDate01-lry','',this)" class="btn_cal"></button>
+	                                        <div id="startDate01-lry" class="calendarPop" style="display: none;">
+	                                            <iframe id="startDate01-ifrm" name="startDate01-ifrm" class="calendar-frame" src="/kccadrPb/adm/calendar.html" title=" 달력 팝업" frameborder="0" scrolling="no"></iframe>
+	                                        </div>
+	                                    </div>
+		                            </div>
+                                     ~
+                                    <div class="calendar_wrap">
+                                    	<input type="text" class="endDate inp" title="검색종료일" id="endDate" name="searchEndDt" value="${adjClsMgrVO.searchEndDt}" data-datecontrol="true" readonly>
+                                    	<div class="calendar_in" id="calendarName_endDate" style="z-index: 9;">
+	                                        <button type="button" value="달력 팝업 열기" onclick="return calendarOpen('endDate-lry','',this)" class="btn_cal" ></button>
+	                                        <div id="endDate-lry" class="calendarPop" style="display: none;">
+	                                            <iframe id="endDate-ifrm" name="endDate-ifrm" class="calendar-frame" src="/kccadrPb/adm/calendar.html"title=" 달력 팝업" frameborder="0" scrolling="no"></iframe>
+	                                        </div>
+	                                    </div>
+                                    </div>
+                                </div>
+                                <button class="btn_search" onclick="fncGoList(); return false;">검색</button>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+            <!-- //list_top -->
+
+            <!-- list -->
+            <div class="list tbType01">
+                <table>
+                    <caption>조정신청 목록 : 번호, 접수일자, 신청인, 피신청인, 대리인, 신청내용, 종결상태등의 정보제공</caption>
+                    <colgroup>
+                        <col style="width: 120px;">
+                        <col style="width: 120px;">
+                        <col style="width: 120px;">
+                        <col style="width: 120px;">
+                        <col style="width: 120px;">
+                        <col style="width: 120px;">
+                        <col style="width: 120px;">
+                        <col style="width: 120px;">
+                        <col style="width: 120px;">
+                    </colgroup>
+                    <thead>
+                    <tr>
+                        <th scope="col">접수일자<%--<button class="sort btn_sort" id="sort_ADR_SEQ">▲</button>--%></th>
+                        <th scope="col">조정번호<%--<button type="button" class="sort sortBtn" id="sort_SBMT_DE"></button>--%></th>
+                        <th scope="col">신청인<%--<button type="button" class="sort sortBtn" id="sort_APPLI_CANT_NM"></button>--%></th>
+                        <th scope="col">피신청인<%--<button type="button" class="sort sortBtn" id="sort_RES_PON_DENT_NM"></button>--%></th>
+                        <th scope="col">신청내용<%--<button type="button" class="sort sortBtn" id="sort_DEPU_TY_NM"></button>--%></th>
+                        <th scope="col">조정부<%--<button type="button" class="sort sortBtn" id="sort_REQ_CN1"></button>--%></th>
+                        <th scope="col">조정조사관<%--<button type="button" class="sort sortBtn" id="sort_STAT_CD"></button>--%></th>
+                        <th scope="col">종결일자<%--<button type="button" class="sort sortBtn" id="sort_STAT_CD"></button>--%></th>
+                        <th scope="col">종결상태<%--<button type="button" class="sort sortBtn" id="sort_STAT_CD"></button>--%></th>
+                    </tr>
+                    </thead>
+                    <tbody>
+						<c:forEach var="list" items="${resultMap }" varStatus="status">
+							<tr>
+								<td class="td_num">
+									<p>
+										<c:out value="${list.sbmtDe}" />
+									</p>
+								</td>
+								<td class="td_date"><c:choose>
+										<c:when test="${list.reqOlCd ne '2' }">
+											<a href="#none" onclick="fncGoDetail('${list.adrSeq}', '${list.adrSn}');">${empty list.adrNo ? '-' : list.adrNo}</a>
+										</c:when>
+										<c:when test="${list.reqOlCd eq '2' }">
+											<a href="#none" onclick="fncGoPastDetail('${list.adrSeq}', '${list.adrSn}');">${empty list.adrNo ? '-' : list.adrNo}</a>
+										</c:when>
+									</c:choose>
+								</td>
+										<td class="td_subscriber">
+				                            	<c:choose>
+				                            		<c:when test="${list.reqOlCd ne '2' }">
+				                                		<a href="#none" onclick="fncGoDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.appliCantNm}"/></a>
+				                                	</c:when>
+				                            		<c:when test="${list.reqOlCd eq '2' }">
+				                                		<a href="#none" onclick="fncGoPastDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.appliCantNm}"/></a>
+				                           			</c:when>
+				                                </c:choose> 
+				                            </td>
+				                            <td class="td_respondent">
+				                            	<c:choose>
+				                            		<c:when test="${list.reqOlCd ne '2' }">
+				                                		<a href="#none" onclick="fncGoDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.resPonDentNm}"/></a>
+				                                	</c:when>
+				                            		<c:when test="${list.reqOlCd eq '2' }">
+				                                		<a href="#none" onclick="fncGoPastDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.resPonDentNm}"/></a>
+				                           			</c:when>
+				                                </c:choose> 
+				                            </td>
+				                            <td class="td_deputy">
+				                            	<c:choose>
+				                            		<c:when test="${list.reqOlCd ne '2' }">
+				                                <a href="#none" onclick="fncGoDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.ccTy}"/></a>
+				                                		<a href="#none" onclick="fncGoDetail('${list.adrSeq}', '${list.adrSn}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a>
+				                                	</c:when>
+				                            		<c:when test="${list.reqOlCd eq '2' }">
+				                                		<a href="#none" onclick="fncGoPastDetail('${list.adrSeq}', '${list.adrSn}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a>
+				                           			</c:when>
+				                                </c:choose> 
+				                            </td>
+				                            <td class="">
+				                                <p><c:out value="${empty list.memDeptNm ? '-' : list.memDeptNm}"/></p>
+				                            </td>
+				                            <td class="">
+				                                <p><c:out value="${empty list.adrAdmNm ? '-' : list.adrAdmNm}"/></p>
+				                            </td>
+				                            <td class="">
+				                                <p><c:out value="${empty list.lastUpdtPnttm ? '-' : list.lastUpdtPnttm}"/></p>
+				                            </td>
+
+				                            <td class="td_status">
+					                            송달정보가 있으면 조회, 없으면 입력 버튼 노출
+					                            <c:choose>	                   
+					                            	<c:when test="${list.finalStatCd eq '304050'}">
+					                            		조정조서종결
+					                            	</c:when>
+					                            	<c:when test="${list.finalStatCd eq '305050'}">
+					                            		취하종결
+					                            	</c:when>
+					                            	<c:when test="${list.finalStatCd eq '307050'}">
+					                            		불성립종결
+					                            	</c:when>
+					                            	<c:when test="${list.finalStatCd eq '306050'}">
+					                            		직권조정 성립
+					                            	</c:when>
+					                            	<c:otherwise>
+					                            		-
+					                            	</c:otherwise>
+					                            </c:choose>                            
+				                            	<kc:code codeId="CC013" code="${list.finalStatCd}"/>
+				                            </td>
+				                        </tr>
+								</c:forEach>
+                    <c:if test="${empty resultMap}">
+                        <tr><td colspan="9"><spring:message code="common.nodata.msg" /></td></tr>
+                    </c:if>
+                    </tbody>
+                </table>
+            </div>
+            <!-- //list -->
+
+            <!-- 하단 버튼 -->
+            <div class="btn_wrap btn_layout01">
+                <%--<button class="btnType09" onclick="fncGoCreate()">등록</button>--%>
+            </div>
+            <!-- //하단 버튼 -->
+
+            <!-- page -->
+            <div class="page">
+                <ui:pagination paginationInfo = "${paginationInfo}"  type="image" jsFunction="linkPage" />
+            </div>
+            <!-- //page -->
+        </div>
+    </div>
+</form:form>
+</div>
+</body>
+</html>

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

@@ -111,7 +111,8 @@
 <div class="cont_wrap sub02_1" id="sub">
 	<div class="inner">
 		<div class="cont_tit">
-			<h2>[체험] 조정사건 목록<c:out value="${adjstIncidentVO.searchStatus == null ? 'A' : adjstIncidentVO.searchStatus}" /></h2>
+<%-- 			<h2>[체험] 조정사건 목록<c:out value="${adjstIncidentVO.searchStatus == null ? 'A' : adjstIncidentVO.searchStatus}" /></h2> --%>
+			<h2>[체험] 조정사건 목록</h2>
 		</div>
 
 		<!-- list_top -->

src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep1.jsp

@@ -60,6 +60,20 @@ $( document ).ready(function(){
 	        }
 	    });
     }
+    
+    $('.temporaryBtn').click(function(){
+    	console.log($(this).hasClass('udpate'));
+    	if(confirm("신청인 정보 임시저장을 진행하시겠습니까?"))
+   		{
+        	if(confirm("신청인 정보 임시저장이 완료되었습니다.\n다음 페이지로 이동하시겠습니까?"))
+       		{
+				document.STEP7.action = "/web/kccadr/adjstExp/adjstReqRegistStep2.do";
+				document.STEP7.submit();
+       		}
+   		}
+    	
+    });
+    
 
 	
 });
@@ -547,11 +561,12 @@ $( document ).ready(function(){
 		<div class="btn_wrap btn_layout01">
 			<c:choose>
 				<c:when test="${empty adjstReqVO.adrSeq}">
-					<button type="button" class="btnType02 btn_save" onclick="AdjstReq.step1Save('${KccadrConstants.ADR_MODE_NEW}'); return false;">임시저장</button>
+					<button type="button" class="btnType01 insert temporaryBtn">임시저장</button>
+					<button type="button" class="btnType02 btn_save" onclick="AdjstReq.step1Save('${KccadrConstants.ADR_MODE_NEW}'); return false;">2단계 이동</button>
 				</c:when>
 				<c:otherwise>
-<%-- 					<button type="button" class="btnType01" onclick="AdjstReq.stepDelete('${adjstReqVO.adrSeq}'); return false;">신청서 삭제</button> --%>
+					<button type="button" class="btnType01 udpate temporaryBtn">임시저장</button>
-					<button type="button" class="btnType02 btn_save" onclick="AdjstReq.step1Save('${KccadrConstants.ADR_MODE_UPT}'); return false;">임시저장</button>
+					<button type="button" class="btnType02 btn_save" onclick="AdjstReq.step1Save('${KccadrConstants.ADR_MODE_UPT}'); return false;">2단계 이동</button>
 				</c:otherwise>
 			</c:choose>
 		</div>

src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp

@@ -65,6 +65,27 @@
 		if ($("button.delPerson").length>0){
 			//$("button.delPerson:eq(0)").hide();
 		}
+	    
+	    $('.temporaryBtn').click(function(){
+	    	console.log($(this).hasClass('udpate'));
+	    	if(confirm("피신청인 정보 임시저장을 진행하시겠습니까?"))
+	   		{
+	        	if(confirm("피신청인 정보 임시저장이 완료되었습니다.\n다음 페이지로 이동하시겠습니까?"))
+	       		{
+					document.STEP8.action = "/web/kccadr/adjstExp/adjstReqRegistStep3.do";
+					document.STEP8.submit();
+	       		}
+	   		}
+	    	
+	    });
+	    
+
+	    $('.btn_move').click(function(){
+
+			document.STEP8.action = "/web/kccadr/adjstExp/adjstReqRegistStep1.do";
+			document.STEP8.submit();
+	    });
+	    
 
 	});
 </script>
@@ -487,20 +508,20 @@
 		</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}">
 				
 					<div class="btn_right">
-						<!-- <button type="button" class="btnType01" onclick="AdjstReq.stepDelete('${adjstReqVO.adrSeq}'); return false;">신청서 삭제</button> -->
+						<button type="button" class="btnType01 insert temporaryBtn">임시저장</button>
-						<button type="button" class="btnType02 btn_save" onclick="AdjstReq.step2Save('${KccadrConstants.ADR_MODE_NEW}'); return false">임시저장</button>
+						<button type="button" class="btnType02 btn_save" onclick="AdjstReq.step2Save('${KccadrConstants.ADR_MODE_NEW}'); return false">3단계 이동</button>
 					</div>
 				
 				</c:when>
 				<c:otherwise>
 					<div class="btn_right">
-<%-- 						<button type="button" class="btnType01" onclick="AdjstReq.stepDelete('${adjstReqVO.adrSeq}'); return false;">신청서 삭제</button> --%>
+						<button type="button" class="btnType01 insert temporaryBtn">임시저장</button>
-						<button type="button" class="btnType02 btn_save" onclick="AdjstReq.step2Save('${KccadrConstants.ADR_MODE_UPT}'); return false">임시저장</button>
+						<button type="button" class="btnType02 btn_save" onclick="AdjstReq.step2Save('${KccadrConstants.ADR_MODE_UPT}'); return false">3단계 이동</button>
 					</div>
 				</c:otherwise>
 			</c:choose>

src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp

@@ -77,6 +77,25 @@ $( document ).ready(function(){
 		alert("체험하기 기능 입니다.");
 	});
 	
+    $('.temporaryBtn').click(function(){
+    	console.log($(this).hasClass('udpate'));
+    	if(confirm("신청인 취지/원인 정보 임시저장을 진행하시겠습니까?"))
+   		{
+        	if(confirm("신청인 취지/원인 정보 임시저장이 완료되었습니다.\n다음 페이지로 이동하시겠습니까?"))
+       		{
+// 				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();
+    });
+	
 });
 
 function fncGoList(status) {
@@ -85,6 +104,9 @@ function fncGoList(status) {
 	linkForm.action = "<c:url value='/web/kccadr/adjstExp/adjstIncidentList.do'/>";
 	linkForm.submit();
 }
+function fn_adjstReq_preview() {
+	window.open("/web/kccadr/adjst/report/adjstReqReportAjax.do?adrSeq=ADR_0000000000003430");
+}
 
 
 </script>
@@ -218,8 +240,10 @@ 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="btnType06 btn_preview" onclick="fn_adjstReq_preview(); return false;" title="새창열림">미리보기</button>
+				<button type="button" class="btnType01 insert temporaryBtn">임시저장</button>
 				<button type="button" class="btnType02 btn_save" onClick="fncGoList(''); return false;">조정신청서 제출</button>
 			</div>
 		</div>

src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp

@@ -111,8 +111,9 @@ function goExpPage(num) {
 		frm.searchStatus.value = 'C';
 	}
 	else if(num==5)
-	{
+	{// 열랍 발급
-		return false;
+		goUrl = "<c:url value='/web/kccadr/adjstExp/adjstIncidentList.do'/>";
+		frm.searchStatus.value = 'C';
 	}
 	else
 	{