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

src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java

@@ -1,12 +1,9 @@
 package kcc.com.cmm.util;
 
-import java.util.Calendar;
-import com.dsmdb.japi.MagicDBAPI;
 import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
 
 import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO;
 

src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java

@@ -223,8 +223,11 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 
 	public ResponseEntity<RestResponse> insertAdjReqMgrRpplReq(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{
 
-    	//조정 사건 키값 생성 및 디비 생성해주기
+    	String adrSeq = adrIdgenService.getNextStringId(); // 고유ID
-    	String adrSeq = adrIdgenService.getNextStringId(); // 고유ID 
+		try {
+			
+		
+    	//조정 사건 키값 생성 및 디비 생성해주기 
     	adjReqMgrPastVO.setAdrSeq(adrSeq);
     	adjReqMgrPastVO.setReqOlCd(KccadrConstants.ADR_REQ_PAST); //과거이력 구분 코드 2
     	
@@ -453,21 +456,29 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 			}
 		}
 		
-		int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn());
+		if(StringUtils.isNotEmpty(adjReqMgrPastVO.getAdrSn()))
-		int cnt = 1;
-		while(cnt <= adrSn)
 		{
-			adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService
+			int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn());
-			adjReqMgrPastVO.setAdrSn(Integer.toString(cnt));
+			int cnt = 1;
-			adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO);
+			while(cnt <= adrSn)
-			cnt++;
+			{
+				adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService
+				adjReqMgrPastVO.setAdrSn(Integer.toString(cnt));
+				adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO);
+				cnt++;
+			}
+			
 		}
 		
 
 		adjReqMgrPastVO.setAdrHstrySeq(adrHstrySeqGnrService.getNextStringId());
 		adjReqMgrPastVO.setAdrSn("0");
 		adjReqMgrPastDAO.insertAdjReqRecordAjax(adjReqMgrPastVO);
-		
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			// TODO: handle exception
+		}
 
 		return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "조정신청 정보 저장이 완료되었습니다.", adrSeq, LocalDateTime.now()));
     }
@@ -974,18 +985,22 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 		{
 			if(prtclRowList.size() < 1)
 			{
-				int adrSn = Integer.parseInt(prmtrAdrSn);
+				if(StringUtils.isNotEmpty(prmtrAdrSn))
-				int cnt = 1;
-				logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn);
-				while(cnt <= adrSn)
 				{
+					int adrSn = Integer.parseInt(prmtrAdrSn);
+					int cnt = 1;
 					logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn);
-					adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService
+					while(cnt <= adrSn)
-					adjReqMgrPastVO.setAdrSn(Integer.toString(cnt));
+					{
-					adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO);
+						logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn);
-					cnt++;
+						adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService
+						adjReqMgrPastVO.setAdrSn(Integer.toString(cnt));
+						adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO);
+						cnt++;
+					}
+					adjReqMgrPastDAO.updateAdrSn(adjReqMgrPastVO);
+					
 				}
-				adjReqMgrPastDAO.updateAdrSn(adjReqMgrPastVO);
 			}
 		}
 			

src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java

@@ -644,7 +644,6 @@ public class AdjReqMgrPastController {
 		//사용자 유니크 아이디 받아오기
 		adjReqMgrPastVO.setFrstRegisterId(userId);
 		adjReqMgrPastVO.setLastUpdusrId(userId);
-		
 		//조정신청, 대리인, 신청인 등록 처리
 		return adjReqMgrPastService.insertAdjReqMgrRpplReq(adjReqMgrPastVO);
 	}

src/main/resources/rebel.xml

@@ -7,20 +7,20 @@
 <application generated-by="eclipse" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
 
 	<classpath>
-		<dir name="${rebel.workspace.path}/kcc_adr_advc_git/target/classes">
+		<dir name="D:/Development/git_repository/kcc_adr_advc_git/target/classes">
 		</dir>
 	</classpath>
 
 	<web>
 		<link target="/">
-			<dir name="${rebel.workspace.path}/kcc_adr_advc_git/target/m2e-wtp/web-resources">
+			<dir name="D:/Development/git_repository/kcc_adr_advc_git/target/m2e-wtp/web-resources">
 				<exclude name="/"/>
 			</dir>
 		</link>
 		<link target="/">
-			<dir name="${rebel.workspace.path}/kcc_adr_advc_git/src/main/webapp">
+			<dir name="D:/Development/git_repository/kcc_adr_advc_git/src/main/webapp">
 			</dir>
 		</link>
 	</web>	
 	
-</application>
+</application>

src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp

@@ -1506,6 +1506,10 @@ function fn_btnLoad(adrSeq){
 <form id="nextGoPageForm">
 	<input type="hidden" id="adrSeqHidden" name="adrSeq" value="<c:out value="${adrVO.adrSeq }" />" />
 </form>
+
+<form id="goForm" name="goForm" action="<c:url value="/kccadr/adjReqMgOff/adjReqMgrPastBasicRegist.do" />" method="post">
+	<input type="hidden" id="adrSeq" name="adrSeq" value="" />
+</form>
 <!-- //cont -->
 </body>
 </html>

src/main/webapp/js/kccadr/adjReqMgrPast/init.js

@@ -18,8 +18,13 @@
 
 		
 
-		var reqTy = '<c:out value="${adrVO.reqTy}" />'; // 조정신청 유형
+//		var reqTy = '<c:out value="${adrVO.reqTy}" />'; // 조정신청 유형
-		var rpplTy = '<c:out value="${adrVO.rpplTy}" />'; // 조정신청 대상
+//		var rpplTy = '<c:out value="${adrVO.rpplTy}" />'; // 조정신청 대상
+		var reqTy = $('input[name=reqTy]:checked').val();; // 조정신청 유형
+		var rpplTy = $('input[name=rpplTy]:checked').val();; // 조정신청 유형
+		
+		console.log('reqTy : ', reqTy);
+		console.log('rpplTy : ', rpplTy);
 		
 		//대리인 정보 처리해주기
 		if (rpplTy == "30") {

src/main/webapp/js/kccadr/adjReqMgrPast/value.js

@@ -402,8 +402,8 @@
 						$(".popBtnChk").text("수정");
 						$(".popBtn").show();
 						
-						
+						fn_goDetail(data.dataSub);
-						fn_btnLoad(data.dataSub);
+//						fn_btnLoad(data.dataSub);
 //						$('#nextGoPageForm').submit();
 					}
                     else if(data.status == 'Unauthorized' || data.status == 'BAD_REQUEST')
@@ -415,4 +415,13 @@
 		    });
 		}
 		
-	}
+	}
+	
+	
+	function fn_goDetail(adrSeq){
+		
+	    var goForm = document.goForm;
+	    goForm.adrSeq.value = adrSeq;
+	    goForm.submit();
+	}
+