Merge branch 'hylee'

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

@@ -654,7 +654,7 @@ public class ApmController {
 //			List<FileVO> fileList = fileService.selectFileInfs(fileVO);
 //			model.addAttribute("fileList", fileList);
 //		}
-		model.addAttribute("exmp", exmp);
+		model.addAttribute("exmpList", exmp);
     	model.addAttribute("ccTy", adjstReqVO.getCcTy());
     	model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); 
     	

src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java

@@ -23,11 +23,13 @@ import java.util.List;
  * 		- 기일통지서		"10";     
  * 		- 기일조서			"20";         
  * 		- 조정권고안		"30";     
- * 		- 조정조서 		"40";     
+ * 		- 조정조서 			"40";     
- * 		- 취하종결통보서	"50";         
+ * 		- 취하종결통보서		"50";         
- * 		- 직권조정결정서 	"60";         
+ * 		- 직권조정결정서 		"60";         
  * 		- 불성립종결통보서	"70";         
- * 		- 확정증명원		"80";     
+ * 		- 확정증명원		"80";   
+ * 
+ *   
  * =========================================================== 
  * DATE          AUTHOR   NOTE 
  * ----------------------------------------------------------- *

src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp

@@ -35,7 +35,7 @@ $(document).ready(function(){
 
 // 신청취지 텍스트에 추가
 function addText(obj){
-	$('#reqCn1').text($('#reqCn1').text()+obj.text);
+	$('#reqCn1').text($('#reqCn1').text().trim()+' '+obj.text);
 }
 		
 </script>

src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp

@@ -1312,7 +1312,6 @@ var AdjstReq  = {
 	    	else if (exmpCd == '02')
    			{
     			uri = "adjstReqOpenExamplePop2.do";
-   			
    			}
 	    	
 	        commonPopLayeropen(
@@ -1325,8 +1324,25 @@ var AdjstReq  = {
 	        );
 	    },
 	    openExpExamplePop : function(exmpCd){
+	    	/*   
+		    	- 01 : 신청취지
+				- 02 : 신청원인
+				- 04 : 답변서
+				- 05 : 사건진행도움말
+    		*/
+	    	var uri = '';
+	    	if(exmpCd == '01')
+    		{
+    			uri = "adjstReqOpenExamplePop.do";
+    		}
+	    	else if (exmpCd == '02')
+   			{
+    			uri = "adjstReqOpenExamplePop2.do";
+   			}
+	    	
 	        commonPopLayeropen(
-	            "/web/kccadr/adjstExp/popup/adjstReqOpenExamplePop.do"
+	            "/web/kccadr/adjst/popup/"+uri
+// 	            "/web/kccadr/adjstExp/popup/"+uri
 	            , 1100
 	            , 600
 	            , {ccTy : $("#ccTy").val(), exmpCd : exmpCd}