Merge branch 'hylee'

src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.springframework.http.ResponseEntity;
 
+import egovframework.rte.fdl.cmmn.exception.FdlException;
 import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO;
 import kcc.kccadr.cmm.RestResponse;
 
@@ -33,6 +34,10 @@ public interface AdjReqMgrPastService {
 
 	List<AdjReqMgrPastVO> findByAdrHstryId(AdjReqMgrPastVO adjReqMgrPastVO);
 
-	ResponseEntity<RestResponse> insertAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO);
+	ResponseEntity<RestResponse> saveAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO) throws FdlException;
+
+	ResponseEntity<RestResponse> deleteAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO);
+
+	String findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO);
 	
 }

src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java

@@ -42,6 +42,9 @@ public class AdjReqMgrPastVO  extends ComDefaultVO implements Serializable {
     private String addUsrNm2; /* 조정위원2 */
     private String addDe; /* 기일조정일자 */
     
+    private String pstCn; /* 조정결과  */
+    
+    
 
 	// 조정사건
 	private String adrSeq = ""; // 조정일련번호
@@ -1335,6 +1338,14 @@ public class AdjReqMgrPastVO  extends ComDefaultVO implements Serializable {
 	public void setAdrHstryList(String[] adrHstryList) {
 		this.adrHstryList = adrHstryList;
 	}
+
+	public String getPstCn() {
+		return pstCn;
+	}
+
+	public void setPstCn(String pstCn) {
+		this.pstCn = pstCn;
+	}
 	
 	
 	

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

@@ -95,5 +95,20 @@ public class AdjReqMgrPastDAO  extends EgovAbstractDAO {
 	public void insertAdjReqRecordAjax(AdjReqMgrPastVO adjPastVO) {
 		insert("adjReqMgrPastDAO.insertAdjReqRecordAjax", adjPastVO );
 	}
+
+	public void updateAdjReqRecordAjax(AdjReqMgrPastVO adjPastVO) {
+		update("adjReqMgrPastDAO.updateAdjReqRecordAjax", adjPastVO );
+		
+	}
+
+	public void deleteAdjReqRecordAjax(AdjReqMgrPastVO adjPastVO) {
+		delete("adjReqMgrPastDAO.deleteAdjReqRecordAjax", adjPastVO );
+		// TODO Auto-generated method stub
+		
+	}
+
+	public String findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO) {
+		return (String) select("adjReqMgrPastDAO.findByAdrHstryWhereStatCd", adjReqMgrPastVO);
+	}
 	
 }

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

@@ -9,6 +9,8 @@ import java.util.stream.Collectors;
 import javax.annotation.Resource;
 
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -23,6 +25,7 @@ import kcc.kccadr.adjReqMgrPast.service.AdjAssMgrPastVO;
 import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastService;
 import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO;
 import kcc.kccadr.adjReqMgrPast.service.AdrMemDeptMgrPstVO;
+import kcc.kccadr.adjReqMgrPast.web.AdjReqMgrPastController;
 import kcc.kccadr.adjreqmgr.service.impl.AdjReqMgrDAO;
 import kcc.kccadr.adjst.service.impl.AdjstReqDAO;
 import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO;
@@ -34,6 +37,7 @@ import kcc.let.utl.fcc.service.EgovCryptoUtil;
 @Service("AdjReqMgrPastService")
 public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements AdjReqMgrPastService {
 
+	private static final Logger logger = LoggerFactory.getLogger(AdjReqMgrPastController.class);
 	// 조정신청 DAO
     @Resource(name = "AdjReqMgrPastDAO")
     private AdjReqMgrPastDAO adjReqMgrPastDAO;
@@ -96,9 +100,10 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 		
 		if(resultAdjReqMgrList != null) {
 			
+			
 			String rpplTy = resultAdjReqMgrList.get(0).getRpplTy();
 			int listCnt = resultAdjReqMgrList.size();
-			
+			logger.info(" + listCnt :: [{}]", listCnt);
 			//신청 대리인 여부 확인
 			int rpplTy_30_exist = 0;
 			
@@ -138,13 +143,14 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 					
 					//신청인 정보 추가해주기
     				temp = resultAdjReqMgrList.get(i);
+    				logger.info("");
     				resultAdjReqMgrOffLine.getAdjReqMgrVoList().add(decryptAdjReqMgrReturn(temp));
 					
 				}
 				
 			}
 			
-			//피신청인 추가해주기
+			//피신청인 추가해주기 
 			int totCnt = 0;
 			for(int i=0; i < listCnt; i++) {
 				
@@ -182,7 +188,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 		String rpplRealPost = egovCryptoUtil.decrypt(adjReqMgrPastVO.getRpplRealPost());			//우편물 수령지 우편번호
 		String rpplRealAddr = egovCryptoUtil.decrypt(adjReqMgrPastVO.getRpplRealAddr());			//우편물 수령지 주소
 		String rpplRealAddrDtl = egovCryptoUtil.decrypt(adjReqMgrPastVO.getRpplRealAddrDtl());	//우편물 수령지 상세주소
-		
+
+		logger.info("resultAdjReqMgrOffLine.getRp11plTy() :: [{}]", adjReqMgrPastVO.getRpplTy());
 		adjReqMgrPastVO.setRpplNm(rpplNm);
 		adjReqMgrPastVO.setRpplEmail(rpplEmail);
 		adjReqMgrPastVO.setRpplPhone(rpplPhone);
@@ -206,23 +213,20 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
     	
 
     	/*
-    	 * 공통코드
-    	 * 10 - 성립
-    	 * 20 - 불성립
-    	 * 70 - 직권조정 - 성립
-    	 * 80 - 직권조정 - 불성립
     	 * 
-    	 * ADR_SUCC		= "900011"; // 조정성립    
+    	 * 304050
-    	 * ADR_NOSUCC	= "900022"; // 조정불성립  
+    	 * 조정조서종결		=> 성립
-    	 * ADR_CNCL		= "901033"; // 조정취하  
+    	 *
-    	 *  */
+    	 * 305050
-    	if("40".equals(adjReqMgrPastVO.getStatCd()))
+    	 * 취하종결		=> 취하
-        	adjReqMgrPastVO.setStatCd(KccadrConstants.ADR_CNCL); 
+    	 *
-    	else if("10".equals(adjReqMgrPastVO.getStatCd()) || "70".equals(adjReqMgrPastVO.getStatCd()))
+    	 * 307050
-    		adjReqMgrPastVO.setStatCd(KccadrConstants.ADR_SUCC); 
+    	 * 불성립종결		=> 불성립  / 조정권고 불성립 / 직권조정 불성립
-    	else if("20".equals(adjReqMgrPastVO.getStatCd()) || "80".equals(adjReqMgrPastVO.getStatCd()))
+    	 * 
-    		adjReqMgrPastVO.setStatCd(KccadrConstants.ADR_NOSUCC); 
+    	 * 306050
-    		
+    	 * 직권조정 성립		=> 직권조정 성립
+    	 * 
+    	 * */
 
     	/* 
     	 * 조정부 등록
@@ -232,8 +236,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 		adrMemDeptMgrPstVO.setMemDeptNm(adjReqMgrPastVO.getMemDeptNm());
 		adrMemDeptMgrPstVO.setFrstRegisterId(adjReqMgrPastVO.getFrstRegisterId());
 		adrMemDeptMgrPstVO.setLastUpdusrId(adjReqMgrPastVO.getLastUpdusrId());
-		
+
-		
 		adjReqMgrPastDAO.insertMemDeptMgrPst(adrMemDeptMgrPstVO);
 
     	/* 
@@ -449,7 +452,10 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 			cnt++;
 		}
 		
-		
+
+		adjReqMgrPastVO.setAdrHstrySeq(adrHstrySeqGnrService.getNextStringId());
+		adjReqMgrPastVO.setAdrSn("0");
+		adjReqMgrPastDAO.insertAdjReqRecordAjax(adjReqMgrPastVO);
 		
 
 		return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "조정신청 정보 저장이 완료되었습니다.", adrSeq, LocalDateTime.now()));
@@ -707,26 +713,67 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 
 	@Override
 	public List<AdjReqMgrPastVO> findByAdrHstryId(AdjReqMgrPastVO adjPastVO) {
-		return adjReqMgrPastDAO.findByAdrHstryId(adjPastVO);
+		List<AdjReqMgrPastVO> list = adjReqMgrPastDAO.findByAdrHstryId(adjPastVO);
+		list.forEach(t -> t.setHstryDe(t.getHstryDe().split(" ")[0]));
+		return list;
 	}
 
 
 	@Override
-	public ResponseEntity<RestResponse> insertAdjReqRecordAjax(AdjReqMgrPastVO adjPastVO) {
+	public ResponseEntity<RestResponse> saveAdjReqRecordAjax(AdjReqMgrPastVO adjPastVO) throws FdlException {
 		
+
+		String adrSeq = adjPastVO.getAdrSeq();
 		
 		for(String adjHstry : adjPastVO.getAdrHstryList()) 
 		{
-			//TODO 사건진행정보 반복문
+			AdjReqMgrPastVO adjReqMgrPastVO = new AdjReqMgrPastVO();
+			adjReqMgrPastVO.setAdrSeq(adrSeq); 
+			adjReqMgrPastVO.setAdrHstrySeq(adjHstry.split("\\|")[0]); 
+			adjReqMgrPastVO.setHstryDe(adjHstry.split("\\|")[1]); 
+			adjReqMgrPastVO.setHstryCn(adjHstry.split("\\|")[2]); 
+			
+			// 비고가 있으면 set
+			if(adjHstry.split("\\|").length == 4)
+			{
+				adjReqMgrPastVO.setAdrSeq(adjPastVO.getAdrSeq());
+				adjReqMgrPastVO.setHstryDetailCn(adjHstry.split("\\|")[3]);
+			}
+			// seq가 없으면 insert
+			if("".equals(adjReqMgrPastVO.getAdrHstrySeq()))
+			{
+				adjReqMgrPastVO.setAdrHstrySeq(adrHstrySeqGnrService.getNextStringId());
+				adjReqMgrPastVO.setAdrSn("0");
+				adjReqMgrPastDAO.insertAdjReqRecordAjax(adjReqMgrPastVO);
+			}else{
+				adjReqMgrPastVO.setLastUpdusrId(adjPastVO.getLastUpdusrId());
+				adjReqMgrPastDAO.updateAdjReqRecordAjax(adjReqMgrPastVO);
+			}
+			
 		}
 		
 		
 		
-		
-		adjReqMgrPastDAO.insertAdjReqRecordAjax(adjPastVO);
 		return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "사건진행정보 등록이 완료되었습니다.", LocalDateTime.now()));
 	}
 
-	
+
+	@Override
+	public ResponseEntity<RestResponse> deleteAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO) {
+
+		try {
+			adjReqMgrPastDAO.deleteAdjReqRecordAjax(adjReqMgrPastVO);
+		} catch (Exception e) {
+			return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "오류가 발생하였습니다.", LocalDateTime.now()));
+		}
+		
+		return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "정상적으로 삭제하였습니다.", LocalDateTime.now()));
+	}
+
+
+	@Override
+	public String findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO) {
+		return adjReqMgrPastDAO.findByAdrHstryWhereStatCd(adjReqMgrPastVO);
+	}
 }
 	

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

@@ -2,37 +2,29 @@ package kcc.kccadr.adjReqMgrPast.web;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Properties;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
-import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
 import kcc.com.cmm.LoginVO;
 import kcc.com.cmm.service.EgovCmmUseService;
 import kcc.com.cmm.service.EgovFileMngService;
 import kcc.com.cmm.service.EgovFileMngUtil;
-import kcc.com.cmm.service.FileVO;
+import kcc.com.cmm.service.impl.SequenceUtilServiceImpl;
 import kcc.com.cmm.util.StringUtil;
 import kcc.com.utl.fcc.service.EgovStringUtil;
 import kcc.kccadr.adjPgrMgr.apm.service.ApmService;
@@ -41,8 +33,6 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO;
 import kcc.kccadr.adjPgrMgr.drt.service.AssVO;
 import kcc.kccadr.adjPgrMgr.drt.service.DrtService;
 import kcc.kccadr.adjPgrMgr.drt.service.DrtVO;
-import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineService;
-import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO;
 import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastService;
 import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO;
 import kcc.kccadr.cmm.RestResponse;
@@ -64,6 +54,8 @@ import kcc.let.utl.fcc.service.EgovCryptoUtil;
  */
 @Controller
 public class AdjReqMgrPastController {
+	
+	private static final Logger logger = LoggerFactory.getLogger(AdjReqMgrPastController.class);
 
 	// 조정신청 서비스단
 	@Resource(name = "AdjReqMgrPastService")
@@ -114,7 +106,11 @@ public class AdjReqMgrPastController {
 	 */
 	@RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastBasicRegist.do")
 	public String adjReqMgrPastBasicRegist(@ModelAttribute("searchVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception {
+		
 
+		//TODO TEST 
+//		adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920");
+		
 		//로그인 권한정보 불러오기
     	LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
 		model.addAttribute("user", user);
@@ -125,17 +121,14 @@ public class AdjReqMgrPastController {
 		
 		int reqPerTotCnt = 0;
 		
-		System.out.println("adjReqMgrPastVO.getAdrSeq() : "+ adjReqMgrPastVO.getAdrSeq());
-
-		//TODO TEST 
-//		adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920");
-//		adjReqMgrPastVO.setAdrSeq("")
-		
 		if(StringUtils.isNotBlank(adjReqMgrPastVO.getAdrSeq())) {
 			
 			//오프라인 조정 신청 정보 불러오기.
-			AdjReqMgrPastVO resultAdjReqMgrOffLine = adjReqMgrPastService.selectAdjReqMgrOffLineInfo(adjReqMgrPastVO);
+			AdjReqMgrPastVO resultAdjReqMgrPast = adjReqMgrPastService.selectAdjReqMgrOffLineInfo(adjReqMgrPastVO);
-			model.addAttribute("adrVO", resultAdjReqMgrOffLine);
+			String statCd = adjReqMgrPastService.findByAdrHstryWhereStatCd(adjReqMgrPastVO);
+	        resultAdjReqMgrPast.setStatCd(statCd);
+	        
+			model.addAttribute("adrVO", resultAdjReqMgrPast);
 		}else {
 			//기본 값 셋팅 - 대리인 여부, 신청자 분류
 			adjReqMgrPastVO.setRpplTy("10");
@@ -143,7 +136,10 @@ public class AdjReqMgrPastController {
 			model.addAttribute("adrVO", adjReqMgrPastVO); 
 		}
 				
-		
+
+		model.addAttribute("prtclSize", adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO).size());
+		// 조정부 / 조사관 정보
+        model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjReqMgrPastVO));
 		model.addAttribute("reqPerTotCnt", reqPerTotCnt);
 		
 		return "kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist";
@@ -163,15 +159,21 @@ public class AdjReqMgrPastController {
 	public String adjReqMgrPastProgRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception {
 
 		//TODO 테스트로 인한 seq 코딩
-		adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920");
+//		adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920");
-		System.out.println("adjReqMgrPastVO.getAdrSeq() !!! : "+ adjReqMgrPastVO.getAdrSeq());
 		
+		logger.info(" ++ [{}]", adjReqMgrPastVO.getAdrSeq());
 		PgrCmmVO cmmVO = new PgrCmmVO();
 		cmmVO.setAdrSeq(adjReqMgrPastVO.getAdrSeq());
         // 조정사건일반
-    	PgrCmmVO info = cmmService.selectPgrCmm(cmmVO);
+		try {
-        model.addAttribute("info", info);
+			PgrCmmVO info = cmmService.selectPgrCmm(cmmVO);
-		model.addAttribute("adjReqMgrPastListVO", adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO));
+			model.addAttribute("info", info);
+			model.addAttribute("adjReqMgrPastListVO", adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO));
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+			// TODO: handle exception
+		}
 		
 		return "kccadr/adjReqMgrPast/adjReqMgrPastProgRegist";
 	}
@@ -188,10 +190,10 @@ public class AdjReqMgrPastController {
 	 */
 	@RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastFileRegist.do")
 	public String adjReqMgrPastFileRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception {
-		
+
+		logger.info(" ++ [{}]", adjReqMgrPastVO.getAdrSeq());
 		//TODO 테스트로 인한 seq 코딩
 //		adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920");
-//		System.out.println("adjReqMgrPastVO.getAdrSeq() !!! : "+ adjReqMgrPastVO.getAdrSeq());
 
 		model.addAttribute("adjReqMgrPastVO", adjReqMgrPastVO);
 //		PgrCmmVO cmmVO = new PgrCmmVO();
@@ -308,6 +310,8 @@ public class AdjReqMgrPastController {
 
 		List<AdjReqMgrPastVO> adrHstryList = adjReqMgrPastService.findByAdrHstryId(adjReqMgrPastVO);
 		
+		
+		
 		model.addAttribute("adrHstryList", adrHstryList);
 		model.addAttribute("adjReqMgrPastVO", adjReqMgrPastVO);
 
@@ -329,9 +333,8 @@ public class AdjReqMgrPastController {
 	 * @return
 	 * @throws Exception 
 	 */
-	@RequestMapping(value = {"/kccadr/adjReqMgOff/insertAdjReqRecordAjax.do"})
+	@RequestMapping(value = {"/kccadr/adjReqMgOff/saveAdjReqRecordAjax.do"})
-//	public ResponseEntity<RestResponse> insertAdjReqRecordAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO
+	public ResponseEntity<RestResponse> saveAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO
-	public ResponseEntity<RestResponse> insertAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO
 			, RedirectAttributes redirectAttributes
 			, HttpServletRequest request) throws Exception {
 		
@@ -344,18 +347,41 @@ public class AdjReqMgrPastController {
 			return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now()));
 		}
 		
+		System.out.println("adjReqMgrPastVO :: "+ adjReqMgrPastVO.getAdrSeq());
 		//사용자 유니크 아이디 받아오기
 		adjReqMgrPastVO.setFrstRegisterId(userId);
+		adjReqMgrPastVO.setLastUpdusrId(userId);
 		
-		//조정신청, 대리인, 신청인 등록 처리
+		return adjReqMgrPastService.saveAdjReqRecordAjax(adjReqMgrPastVO);
-		return adjReqMgrPastService.insertAdjReqRecordAjax(adjReqMgrPastVO);
 	}
-	/*
+	
-	 *	<![CDATA[
+	/** 
-	 *		DELETE FROM COMTNBANNER              
+	 * @methodName	: deleteAdjReqRecordAjax 
-	 *		WHERE BANNER_ID = #bannerId#        
+	 * @author		: 이호영
-	 *	]]>                               
+	 * @date		: 2022.09.27 
+	 * @description	: 과거사건등록 사건진행정보 row 삭제
+	 * @param adjReqMgrPastVO
+	 * @param redirectAttributes
+	 * @param request
+	 * @return
+	 * @throws Exception 
 	 */
+	@RequestMapping(value = {"/kccadr/adjReqMgOff/deleteAdjReqRecordAjax.do"})
+	public ResponseEntity<RestResponse> deleteAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO
+			, RedirectAttributes redirectAttributes
+			, HttpServletRequest request) throws Exception {
+		
+		//로그인 권한정보 불러오기
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
+		String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
+		
+		if(userId.equals("")) {
+			// Unauthorized : 401, 권한 없음, 예를 들면, 로그인 페이지가 필요한 페이지를 로그인 없이 접속하려는 경우 반환되는 코드 (인증 실패) (Unauthorized)
+			return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now()));
+		}
+		
+		return adjReqMgrPastService.deleteAdjReqRecordAjax(adjReqMgrPastVO);
+	}
 	
 	/** 
 	 * @methodName	: insertAdjReqMgrOffAjax 
@@ -391,7 +417,6 @@ public class AdjReqMgrPastController {
 		return adjReqMgrPastService.insertAdjReqMgrRpplReq(adjReqMgrPastVO);
 	}
 	
-	
 	/** 
 	 * @methodName	: checkNInsertAprvlPastAjax 
 	 * @author		: 이호영
@@ -459,6 +484,41 @@ public class AdjReqMgrPastController {
 	
 	
 	
+	//TODO 구현예정
+	/** 
+	 * @methodName	: deletePrtclProc 
+	 * @author		: 이호영
+	 * @date		: 2022.09.27 
+	 * @description	: 기존 차수별 데이터는 삭제
+	 * @param adjReqMgrPastVO
+	 * @param redirectAttributes
+	 * @param request
+	 * @return
+	 * @throws Exception 
+	 */
+	@RequestMapping(value = {"/kccadr/adjReqMgOff/deletePrtclProc.do"})
+	public ResponseEntity<RestResponse> deletePrtclProc(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO
+			, RedirectAttributes redirectAttributes
+			, HttpServletRequest request) throws Exception {
+		
+		//로그인 권한정보 불러오기
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
+		String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
+		
+		if(userId.equals("")) {
+			// Unauthorized : 401, 권한 없음, 예를 들면, 로그인 페이지가 필요한 페이지를 로그인 없이 접속하려는 경우 반환되는 코드 (인증 실패) (Unauthorized)
+			return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now()));
+		}
+		
+		//사용자 유니크 아이디 받아오기
+//		adjReqMgrPastVO.setLastUpdusrId(userId);
+		
+		return null;
+//		return adjReqMgrPastService.checkNUpdateAprvlPastAjax(adjReqMgrPastVO);
+	}
+	
+	
+	
 	
 	
 	

src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml

@@ -68,27 +68,30 @@
 	<!-- 오프라인 조정사건정보 수정 : 조정사건 정보 불러오기 -->
 	<select id="adjReqMgrPastDAO.selectAdjReqMgrMasterInfo" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
 		
-		SELECT ADR_SEQ AS adrSeq,
+		SELECT amm.ADR_SEQ AS adrSeq,
-		       ADR_NO AS adrNo,
+		       amm.ADR_NO AS adrNo,
-		       STAT_CD AS statCd,
+		       amm.STAT_CD AS statCd,
-		       REQ_OL_CD AS reqOlCd,
+		       amm.REQ_OL_CD AS reqOlCd,
-		       REQ_CN1 AS reqCn1,
+		       amm.REQ_CN1 AS reqCn1,
-		       REQ_CN2 AS reqCn2,
+		       amm.REQ_CN2 AS reqCn2,
-		       REQ_TY AS reqTy,
+		       amm.REQ_TY AS reqTy,
-		       CC_TY AS ccTy,
+		       amm.CC_TY AS ccTy,
-		       SBMT_YN AS sbmtYn,
+		       amm.SBMT_YN AS sbmtYn,
-		       SBMT_DE AS sbmtDe,
+		       amm.SBMT_DE AS sbmtDe,
-		       ADR_COST AS adrCost,
+		       amm.ADR_COST AS adrCost,
-		       ADR_PAY_YN AS adrPayYn,
+		       amm.ADR_PAY_YN AS adrPayYn,
-		       APPR_SEQ AS apprSeq,
+		       amm.APPR_SEQ AS apprSeq,
-		       APPR_DE AS apprDe,
+		       amm.APPR_DE AS apprDe,
-		       ATCH_FILE_ID AS atchFileId,
+		       amm.ATCH_FILE_ID AS atchFileId,
-		       FRST_REGISTER_ID AS frstRegisterId,
+		       amm.FRST_REGISTER_ID AS frstRegisterId,
-		       FRST_REGIST_PNTTM AS frstRegistPnttm,
+		       amm.FRST_REGIST_PNTTM AS frstRegistPnttm,
-		       LAST_UPDUSR_ID AS lastUpdusrId,
+		       amm.LAST_UPDUSR_ID AS lastUpdusrId,
-		       LAST_UPDT_PNTTM AS lastUpdtPnttm
+		       amm.LAST_UPDT_PNTTM AS lastUpdtPnttm,
-		FROM   ADR_MGR_MASTER
+		       amd.pst_cn AS pstCn 
-		WHERE  ADR_SEQ          = #adrSeq#
+		FROM ADR_MGR_MASTER amm
+		join adr_mgr_detail amd
+		on amm.adr_seq = amd.adr_seq 
+		WHERE  amm.ADR_SEQ = #adrSeq#
 
 	</select>
 	
@@ -143,6 +146,7 @@
               ADR_SEQ,
               ADR_SN,
               ADR_ADM_ID,
+              PST_CN,
               MEM_DEPT_SEQ,
               FRST_REGIST_PNTTM,
               FRST_REGISTER_ID,
@@ -154,6 +158,7 @@
               #adrSeq#,
               #adrSn#,
               #adrAdmId#,
+              #pstCn#,
               #memDeptSeq#,
               NOW() ,
               #frstRegisterId# ,
@@ -380,16 +385,16 @@
 	<!-- 과거이력 - 차수별 기일조정 팝업 - 조정부 조사관 불러오기 -->
 	<select id="adjReqMgrPastDAO.selectMemAss" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
 	
-		SELECT 
+	select
-			AMDMP.MEM_DEPT_NM as memDeptNm
+		AMDMP.MEM_DEPT_NM as memDeptNm ,
-			, AAMP.ASS_PST_USR_NM as assPstUsrNm 
+		AAMP.ASS_PST_USR_NM as assPstUsrNm
-		FROM 
+	from
-			ADR_MGR_DETAIL AMD
+		ADR_MGR_DETAIL AMD
-		LEFT JOIN ADR_MEM_DEPT_MGR_PST AMDMP
+	left join ADR_MEM_DEPT_MGR_PST AMDMP on
-			ON AMD.ADR_ADM_ID  = AMDMP.MEM_PST_SEQ 
+		AMD.MEM_DEPT_SEQ = AMDMP.MEM_PST_SEQ
-		LEFT JOIN ADR_ASS_MGR_PST AAMP
+	left join ADR_ASS_MGR_PST AAMP on
-			ON AMD.MEM_DEPT_SEQ  = AAMP.ASS_PST_SEQ  
+		AMD.ADR_ADM_ID = AAMP.ASS_PST_SEQ
-		WHERE AMD.ADR_SEQ= #adrSeq#
+	where AMD.ADR_SEQ= #adrSeq#
 	</select>
 	
 	<!-- 과거사건등록 - 기일조서 등록 출석인 관리-->
@@ -584,36 +589,71 @@
 	</select>
 	
 	<!-- 과거사건등록 - 기일조서 등록 출석인 관리-->
-	<insert id="adjReqMgrPastDAO.insertAdjReqRecordAjax" parameterClass="java.util.List">
+	<insert id="adjReqMgrPastDAO.insertAdjReqRecordAjax" parameterClass="AdjReqPastVO">
 
-		INSERT INTO ADR_ASS_MGR_PST (
+		INSERT INTO ADR_HSTRY (
-			  ADR_SEQ
+			ADR_SEQ
 			, ADR_SN
-			, ASS_PST_SEQ
+			, ADR_HSTRY_SEQ
-			, ASS_PST_USR_TY
+			, HSTRY_DE
-			, ASS_PST_USR_NM
+			, HSTRY_CN
-			, ADD_YN
+			<isNotEmpty property="statCd" >
-			, ADD_CHG_YN
+			, STAT_CD 
+			</isNotEmpty>
+			<isEqual property="hstryDetailCn" compareValue="">
+			, HSTRY_DETAIL_CN 
+			</isEqual>
 			, FRST_REGIST_PNTTM
 			, FRST_REGISTER_ID
-			, LAST_UPDT_PNTTM
-			, LAST_UPDUSR_ID
 		) VALUES 
-		 <iterate conjunction=",">
 		(
-			#[].adrSeq#         
+			#adrSeq#         
-			, #[].adrSn#          
+			, #adrSn#          
-			, #[].assPstSeq#      
+			, #adrHstrySeq#
-			, #[].assPstUsrTy#    
+			, TO_DATETIME(TO_CHAR(#hstryDe#,'YYYY-MM-DD HH24:MI'))
-			, #[].assPstUsrNm#    
+			, #hstryCn#
-			, #[].addYn#          
+			<isNotEmpty property="statCd" >
-			, 'N'       
+			, #statCd#
+			</isNotEmpty>      
+			<isEqual property="hstryDetailCn" compareValue="">    
+			, #hstryDetailCn# 
+			</isEqual>   
 			, NOW()
-			, #[].frstRegisterId#
+			, #frstRegisterId#
-			, NOW()
-			, #[].lastUpdusrId#
 		)
-		</iterate>
 	</insert>
 	
+	<!-- 과거사건등록 - 기일조서 등록 출석인 관리-->
+	<update id="adjReqMgrPastDAO.updateAdjReqRecordAjax" parameterClass="AdjReqPastVO">
+
+        UPDATE ADR_HSTRY SET
+			HSTRY_DE				=  TO_DATETIME(TO_CHAR(#hstryDe#,'YYYY-MM-DD HH24:MI'))
+			, HSTRY_CN				=  #hstryCn#
+			<isEqual property="hstryDetailCn" compareValue="">
+				, HSTRY_DETAIL_CN		=  null
+			</isEqual>
+			<isNotEqual property="hstryDetailCn" compareValue="">
+				, HSTRY_DETAIL_CN		=  #hstryDetailCn#
+			</isNotEqual>
+			, LAST_UPDUSR_ID		=  #lastUpdusrId#
+			, LAST_UPDT_PNTTM		=  NOW()
+        WHERE 
+        	ADR_HSTRY_SEQ = #adrHstrySeq#
+
+	</update>
+	
+	<!-- 과거사건등록 - 사건진행정보 이력 삭제-->
+	<update id="adjReqMgrPastDAO.deleteAdjReqRecordAjax" parameterClass="AdjReqPastVO">
+			DELETE FROM ADR_HSTRY              
+			WHERE ADR_HSTRY_SEQ = #adrHstrySeq#        
+	</update>
+	
+	<select id="adjReqMgrPastDAO.findByAdrHstryWhereStatCd" parameterClass="AdjReqPastVO" resultClass="String">
+		SELECT 
+			STAT_CD
+		FROM ADR_HSTRY
+		WHERE ADR_SEQ = #adrSeq#
+		AND STAT_CD IS NOT NULL
+	</select>
+	
 </sqlMap>

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

@@ -37,6 +37,47 @@
 <script type="text/javaScript" language="javascript">
 
 
+$(document).on('change', '#adrSnTemp', function(){
+	console.log($('#prtclSize').val());
+	if($('#prtclSize').val() != 0)
+	{
+		if(confirm("기존에 등록된 데이터가 있다면 초기화 됩니다.\n초기화 하시겠습니까?"))
+		{
+
+			var form = document.adrVO;
+			var data = new FormData(form);
+
+			$.ajax({	
+		        type: "POST",
+		        url: "<c:url value='/kccadr/adjReqMgOff/deletePrtclProc.do' />",
+		        data: data,
+		        dataType:'json',
+		        async: false,
+		        processData: false,
+		        contentType: false,
+		        cache: false,
+		        success: function (data) {
+                    console.log('data : ', data);
+					if(data.status == 'OK'){
+						alert(data.data);
+						$('#adrSeq').val(data.dataSub);
+						$('#nextGoPageForm').submit();
+					}
+                    else if(data.status == 'Unauthorized')
+                    {	
+                        alert(data.message);
+                        return false;
+                    }
+				},
+		        error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); }
+		    });
+			
+		}
+		
+	}
+});
+
+
 
 </script>
 </head>
@@ -49,9 +90,11 @@
 
 <form:form commandName="adrVO" name="adrVO"  method="post"  enctype="multipart/form-data">
 	<form:input type="hidden" path="reqPerTotCnt" id="reqPerTotCnt"/>
+	<input type="hidden" name="adrSeq" id="adrSeq" value="<c:out value="${adrVO.adrSeq }" />" />
 	<input type="hidden" name="memDeptNm" id="memDeptNm"/>
 	<input type="hidden" name="assPstUsrNm" id="assPstUsrNm"/>
 	<input type="hidden" name="appResultTy" id="appResultTy"/>
+	<input type="hidden" name="prtclSize" id="prtclSize" value="<c:out value="${prtclSize }" />" />
 	<input type="hidden" name="statCd" id="statCd" value="" />
 	<input type="hidden" name="adrNo" id="adrNo" value="" />
 	<input type="hidden" name="frstRegistPnttm" id="frstRegistPnttm" value="" />
@@ -138,11 +181,11 @@
 							<td>
 								<div class="radio_wrap">
 									<span>
-										<input type="radio" id="reqlTy1" name="rpplTy" value="10" <c:if test="${adrVO.rpplTy == '10'}">checked</c:if> >
+										<input type="radio" id="reqlTy1" name="rpplTy" value="10" <c:if test="${adrVO.rpplTy eq '10'}">checked</c:if> >
-										<label for="reqlTy1">본인</label>
+										<label for="reqlTy1">본인<c:out value="${adrVO.rpplTy }" /></label>
 									</span>
 									<span>
-										<input type="radio" id="rpplTy2" name="rpplTy" value="30" <c:if test="${adrVO.rpplTy == '30'}">checked</c:if> >
+										<input type="radio" id="rpplTy2" name="rpplTy" value="30" <c:if test="${adrVO.rpplTy eq '30'}">checked</c:if> >
 										<label for="rpplTy2">대리인</label>
 									</span>
 								</div>
@@ -1349,13 +1392,13 @@
 							<th>
 								<p>조정부</p>
 							</th>
-							<td><input type="text" id="memDeptNmTemp" value="" size="30"/></td>
+							<td><input type="text" id="memDeptNmTemp" value="<c:out value="${memAss.memDeptNm }" />" size="30"/></td>
 						</tr>
 						<tr>
 							<th>
 								<p>조정조사관</p>
 							</th>
-							<td><input type="text" id="assPstUsrNmTemp" value="" size="30"/></td>
+							<td><input type="text" id="assPstUsrNmTemp" value="<c:out value="${memAss.assPstUsrNm }" />" size="30"/></td>
 						</tr>
 						<tr>
 							<th>
@@ -1364,11 +1407,11 @@
 							<td>
 								<select id="adrSnTemp">
 									<option value="" >선택 </option>
-									<option value="1">1차</option>
+									<option value="1" <c:if test="${prtclSize eq 1 }"> selected="selected" </c:if>>1차</option>
-									<option value="2">2차</option>
+									<option value="2" <c:if test="${prtclSize eq 2 }"> selected="selected" </c:if>>2차</option>
-									<option value="3">3차</option>
+									<option value="3" <c:if test="${prtclSize eq 3 }"> selected="selected" </c:if>>3차</option>
-									<option value="4">4차</option>
+									<option value="4" <c:if test="${prtclSize eq 4 }"> selected="selected" </c:if>>4차</option>
-									<option value="5">5차</option>
+									<option value="5" <c:if test="${prtclSize eq 5 }"> selected="selected" </c:if>>5차</option>
 								</select>
 							</td>
 						</tr>
@@ -1380,9 +1423,20 @@
 								<select id="resultSelect">
 									<option value="">선택</option>
 									<option value="00">종결</option>
-									<option value="40">조정취하</option>
+									<option value="305050">조정취하</option>
 								</select>
-                                <kc:select codeId="CC023" includes="10,20,70,80" id="detailResult" defaultText="선택"/>
+								<select id="detailResult">
+									<option value="">선택</option>
+									<option value="304050">조정조서종결(성립)</option>
+									<option value="307050">불성립종결(불성립 / 조정권고 불성립 / 직권조정 불성립)</option>
+									<option value="306050">직권조정성립</option>
+								</select>
+							</td>
+						</tr>
+						<tr>
+							<th>조정결과</th>
+							<td>
+								<form:textarea path="pstCn" id="pstCn" cols="30" rows="5" cssClass="purpose_text" />
 							</td>
 						</tr>
 					</tbody>

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

@@ -31,202 +31,20 @@
 <script type="text/javascript">
 
 
+
 $(document).ready(function(){
 	
-});
+	$('#goPage').on('click', function(){
-
+		$('#goPageForm').attr('action', '<c:url value="/kccadr/adjReqMgOff/adjReqMgrPastRecordRegist.do" />');
-//단일 첨부파일 버튼
+		$('#goPageForm').submit();
-$(function() {
+	});
-	$('#filebutton').click(function(e) {
+	
-		e.preventDefault();
+	$('#prevPage').on('click', function(){
-		$('#file_temp').click();
+		$('#goPageForm').attr('action', '<c:url value="/kccadr/adjReqMgOff/adjReqMgrPastProgRegist.do" />');
+		$('#goPageForm').submit();
 	});
 });
 
-//등록 버튼
-function fncReg() {
-	var f = document.getElementById("listForm");
-	var data = new FormData(f);
-	_fileForm2.forEach(function(obj, idx) {
-		if (obj)
-			data.append("file" + idx, obj.fileObj);
-	});
-
-	if (validation()) {
-		if(confirm("사건문서를 등록 하시겠습니까?")){
-			
-			$.ajax({
-				type : "POST",
-				enctype : 'multipart/form-data',
-				url : "/kccadr/adjPgrMgr/apm/docRegPopAjax.do",
-				data : data,
-				dataType : 'json',
-				async : false,
-				processData : false,
-				contentType : false,
-				cache : false,
-				success : function(returnData, status) {
-					if (returnData.result == 'success') {
-						alert("사건문서 제출이 완료되었습니다.");
-						opener.location.reload(true);
-						self.close();
-					} else {
-						alert(returnData.message);
-					}
-
-				},
-				error : function(e) {
-					alert("사건문서 제출에 실패하였습니다.");
-					console.log("ERROR : ", e);
-				}
-			});
-		}
-
-	}
-
-}
-
-function validation() {
-
-	if (isEmpty($('#adrDocCn1').val())) {
-		alert('답변내용을 입력해 주세요.');
-		return false;
-	}
-
-	if ($('#tbody_fiielist tr').length * 1 <= 0) {
-		alert("첨부서류를 등록해 주세요");
-		return false;
-
-	}
-	return true;
-}
-
-//문서구분에 따른 신청인 피신청인 선택값 show/hide
-function docTypeDiv(divVal){
-	//답변서
-	if(divVal == '10'){
-		//신청인
-		$('#rpplSeq').find('option[name=10]').prop('disabled', true);
-		$('#rpplSeq').find('option[name=10]').prop('selected', false);
-		//피신청인
-		$('#rpplSeq').find('option[name=20]').each(function(){
-			$(this).prop('disabled', false);
-			$(this).eq(0).prop('selected', true);
-		});
-		//조정조사관
-		$('#rpplSeq').find('option[name=30]').prop('disabled', true);
-		$('#rpplSeq').find('option[name=30]').prop('selected', false);
-	}
-	//준비서면
-	else if(divVal == '20'){
-		//신청인
-		$('#rpplSeq').find('option[name=10]').prop('disabled', false);
-		$('#rpplSeq').find('option[name=10]').prop('selected', true);
-		//피신청인
-		$('#rpplSeq').find('option[name=20]').each(function(){
-			$(this).prop('disabled', true);
-			$(this).prop('selected', false);
-		});
-		//조정조사관
-		$('#rpplSeq').find('option[name=30]').prop('disabled', true);
-		$('#rpplSeq').find('option[name=30]').prop('selected', false);
-	}
-	//취하신청서
-	else if(divVal == '30'){
-		$('#rpplSeq').find('option[name=10]').prop('disabled', false);
-		$('#rpplSeq').find('option[name=10]').prop('selected', true);
-		//피신청인
-		$('#rpplSeq').find('option[name=20]').each(function(){
-			$(this).prop('disabled', true);
-			$(this).prop('selected', false);
-		});
-		//조정조사관
-		$('#rpplSeq').find('option[name=30]').prop('disabled', true);
-		$('#rpplSeq').find('option[name=30]').prop('selected', false);
-	}
-	//피신청인 경정신청서
-	else if(divVal == '40'){
-		$('#rpplSeq').find('option[name=10]').prop('disabled', false);
-		$('#rpplSeq').find('option[name=10]').prop('selected', true);
-		//피신청인
-		$('#rpplSeq').find('option[name=20]').each(function(){
-			$(this).prop('disabled', true);
-			$(this).prop('selected', false);
-		});
-		//조정조사관
-		$('#rpplSeq').find('option[name=30]').prop('disabled', true);
-		$('#rpplSeq').find('option[name=30]').prop('selected', false);
-	}
-	//조정기일 연장동의서
-	else if(divVal == '50'){
-		$('#rpplSeq').find('option[name=10]').prop('disabled', false);
-		$('#rpplSeq').find('option[name=10]').prop('selected', true);
-		//피신청인
-		$('#rpplSeq').find('option[name=20]').each(function(){
-			$(this).prop('disabled', false);
-			$(this).prop('selected', false);
-		});
-		//조정조사관
-		$('#rpplSeq').find('option[name=30]').prop('disabled', true);
-		$('#rpplSeq').find('option[name=30]').prop('selected', false);
-	}
-	//우편발송 배달증명서
-	else if(divVal == '60'){
-		$('#rpplSeq').find('option[name=10]').prop('disabled', false);
-		$('#rpplSeq').find('option[name=10]').prop('selected', true);
-		//피신청인
-		$('#rpplSeq').find('option[name=20]').each(function(){
-			$(this).prop('disabled', false);
-			$(this).prop('selected', false);
-		});
-		//조정조사관
-		$('#rpplSeq').find('option[name=30]').prop('disabled', true);
-		$('#rpplSeq').find('option[name=30]').prop('selected', false);
-	}
-	//관련 문서 전체
-	else if(divVal == '70'){
-		//신청인
-		$('#rpplSeq').find('option[name=10]').prop('disabled', true);
-		$('#rpplSeq').find('option[name=10]').prop('selected', false);
-		//피신청인
-		$('#rpplSeq').find('option[name=20]').each(function(){
-			$(this).prop('disabled', true);
-			$(this).prop('selected', false);
-		});
-		//조정조사관
-		$('#rpplSeq').find('option[name=30]').prop('disabled', false);
-		$('#rpplSeq').find('option[name=30]').prop('selected', true);
-	}
-	//조정기일변경신청서
-	else if(divVal == '80'){
-		//신청인
-		$('#rpplSeq').find('option[name=10]').prop('disabled', false);
-		$('#rpplSeq').find('option[name=10]').prop('selected', true);
-		//피신청인
-		$('#rpplSeq').find('option[name=20]').each(function(){
-			$(this).prop('disabled', false);
-			$(this).prop('selected', false);
-		});
-		//조정조사관
-		$('#rpplSeq').find('option[name=30]').prop('disabled', true);
-		$('#rpplSeq').find('option[name=30]').prop('selected', false);
-	}
-	//직권조정 이의신청서
-	else if(divVal == '90'){
-		//신청인
-		$('#rpplSeq').find('option[name=10]').prop('disabled', false);
-		$('#rpplSeq').find('option[name=10]').prop('selected', true);
-		//피신청인
-		$('#rpplSeq').find('option[name=20]').each(function(){
-			$(this).prop('disabled', false);
-			$(this).prop('selected', false);
-		});
-		//조정조사관
-		$('#rpplSeq').find('option[name=30]').prop('disabled', true);
-		$('#rpplSeq').find('option[name=30]').prop('selected', false);
-	}
-}
-
 //더하기 버튼 alert
 function fn_testPageAlert(){
 	alert("사건관련 문서 추가 시 작동하는 버튼입니다. \n 첨부파일 솔루션 도입 후 적용 예정");
@@ -262,6 +80,9 @@ function fn_testPageAlert(){
 	<input type="hidden" id="rpplSeq" name="rpplSeq" value=""/>
 </form>
 
+<form id="goPageForm" name="goPageForm" method="post">
+	<input type="hidden" id="adrSeq" name="adrSeq" value="${adjReqMgrPastVO.adrSeq }">
+</form>
 	<div class="cont_wrap">
 		<div class="box">
 
@@ -415,10 +236,10 @@ function fn_testPageAlert(){
 				<!-- 하단 버튼 -->
 				<div class="btn_wrap btn_layout01">
 					<div class="area_left">
-						<button type="button" class="btnType04">&lt; 이전단계 이동</button>
+						<button type="button" id="prevPage" class="btnType04">&lt; 이전단계 이동</button>
 					</div>
 					<div class="area_right">
-						<button type="button" class="btnType06">사건관련문서 저장 &gt;</button>
+						<button type="button" id="goPage" class="btnType06">다음단계 이동 &gt;</button>
 					</div>
 				</div>
 				<!-- //하단 버튼 -->
@@ -431,64 +252,3 @@ function fn_testPageAlert(){
 
 </body>
 </html>
-	<%-- <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>
-						<p>과거사건등록</p>
-					</li>
-					<li><span class="cur_nav">사건관련문서 등록</span></li>
-				</ul>
-			</div>
-			<!-- //cont_tit -->
-
-			<div class="cont">
-				<!-- list_top -->
-				<div class="list_top">
-					<p>총 진행 회차 : <span><c:out value="${fn:length(adjReqMgrPastListVO) }"/></span>건</p>
-				</div>
-				<!-- //list_top -->
-				<!-- list -->
-				<div class="list tbType01">
-					<table>
-						<colgroup>
-							<col style="width: 10%">
-							<col style="width: auto">
-							<col style="width: 10%">
-						</colgroup>
-						<thead>
-						<tr>
-							<th>회차</th>
-							<th>결과</th>
-							<th>등록/수정</th>
-						</tr>
-						</thead>
-						<tbody>
-							<tr>
-								<td>
-									1
-								</td>
-								<td>
-									해당 차수의 정보를 등록해 주세요
-								</td>
-								<td>
-									<button class="btn_search regBtn">등록</button>
-								</td>
-							</tr>
-						</tbody>
-					</table>
-				</div>
-				<!-- //list -->
-			</div>
-		</div>
-	</div>
-	<!-- //cont -->
-<!-- //cont --> --%>

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

@@ -30,50 +30,19 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <script type="text/javascript">
 
-// 	function fncSelectConciliatorManageList(){
-// 		linkPage(1);
-// 	}
-
-// 	function linkPage(pageNo){
-// 		var listForm = document.listForm ;
-// 		listForm.pageIndex.value = pageNo ;
-// 		listForm.searchCondition.value = $('#searchCondition').val();
-// 		listForm.searchKeyword.value = $('#searchKeyword').val();
-// 		listForm.action = "<c:url value='/kccadr/adjPgrMgr/exmp/exmpAppManagerList.do'/>";
-// 		listForm.submit();
-// 	}
-
-// 	function fncCreate() {
-// 		var listForm = document.listForm ;
-// 		listForm.action = "<c:url value='/kccadr/adjPgrMgr/exmp/exmpAppManagerCreate.do'/>";
-// 		listForm.submit();
-// 	}
-
-
-
-// 	function fn_egov_checkAll(){
-// 		var FLength = document.getElementsByName("memSeqArr").length;
-// 		var checkAllValue = document.getElementById('checkAll').checked;
-
-// 		//undefined
-// 		if( FLength == 1){
-// 			document.getElementById("memSeqArr0").checked = checkAllValue;
-// 		} else {
-// 			for(var i=0; i < FLength; i++) {
-// 				document.getElementsByName("memSeqArr")[i].checked = checkAllValue;
-// 			}
-// 		}
-// 	}
-
-
-//     function fncDetailPage(exmpMgrId){
-//         var listForm = document.listForm ;
-//         listForm.exmpMgrId.value = exmpMgrId;
-//         listForm.action = "<c:url value='/kccadr/adjPgrMgr/exmp/exmpAppManagerDetail.do'/>";
-//         listForm.submit();
-//     }
 
 $(document).ready(function(){
+
+	$('#prevPage').on('click', function(){
+		$('#goPageForm').attr('action', '/kccadr/adjReqMgOff/adjReqMgrPastBasicRegist.do');
+		$('#goPageForm').submit();
+	});
+
+	$('#goPage').on('click', function(){
+		$('#goPageForm').attr('action', '/kccadr/adjReqMgOff/adjReqMgrPastFileRegist.do');
+		$('#goPageForm').submit();
+	});
+	
 	
 	// 등록버튼 클릭 이벤트
 	$('.regBtn').on('click', function(){
@@ -200,16 +169,17 @@ function fn_nextGoPageForm(){
 				<!-- //list -->
 				<div class="btn_wrap btn_layout01">
 					<div class="area_left">
+						<button type="button" id="prevPage" class="btnType04">&lt; 이전단계 이동</button>
 					</div>
 					<div class="area_right">
-						<button type="button" class="btnType06" onclick="fn_nextGoPageForm(); return false;">다음 단계 ></button>
+						<button type="button" id="goPage" class="btnType06">다음단계 이동 &gt;</button>
 					</div>
 				</div>
 				<!-- //page -->
 			</div>
 		</div>
 	</div>
-	<form id="nextGoPageForm" action="<c:url value='/kccadr/adjReqMgOff/adjReqMgrPastFileRegist.do' />">
+	<form id="goPageForm" action="<c:url value='/kccadr/adjReqMgOff/adjReqMgrPastFileRegist.do' />">
 		<input type="hidden" id="adrSeq" name="adrSeq" value="${adjReqMgrPastVO.adrSeq }">
 	</form>
 	<!-- //cont -->

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

@@ -32,80 +32,45 @@
 <script src="//cdnjs.cloudflare.com/ajax/libs/timepicker/1.3.5/jquery.timepicker.min.js"></script>
 <script type="text/javascript">
 
-// 	function fncSelectConciliatorManageList(){
-// 		linkPage(1);
-// 	}
-
-// 	function linkPage(pageNo){
-// 		var listForm = document.listForm ;
-// 		listForm.pageIndex.value = pageNo ;
-// 		listForm.searchCondition.value = $('#searchCondition').val();
-// 		listForm.searchKeyword.value = $('#searchKeyword').val();
-// 		listForm.action = "<c:url value='/kccadr/adjPgrMgr/exmp/exmpAppManagerList.do'/>";
-// 		listForm.submit();
-// 	}
-
-// 	function fncCreate() {
-// 		var listForm = document.listForm ;
-// 		listForm.action = "<c:url value='/kccadr/adjPgrMgr/exmp/exmpAppManagerCreate.do'/>";
-// 		listForm.submit();
-// 	}
-
-
-
-// 	function fn_egov_checkAll(){
-// 		var FLength = document.getElementsByName("memSeqArr").length;
-// 		var checkAllValue = document.getElementById('checkAll').checked;
-
-// 		//undefined
-// 		if( FLength == 1){
-// 			document.getElementById("memSeqArr0").checked = checkAllValue;
-// 		} else {
-// 			for(var i=0; i < FLength; i++) {
-// 				document.getElementsByName("memSeqArr")[i].checked = checkAllValue;
-// 			}
-// 		}
-// 	}
-
-
-//     function fncDetailPage(exmpMgrId){
-//         var listForm = document.listForm ;
-//         listForm.exmpMgrId.value = exmpMgrId;
-//         listForm.action = "<c:url value='/kccadr/adjPgrMgr/exmp/exmpAppManagerDetail.do'/>";
-//         listForm.submit();
-//     }
 
 $(document).ready(function(){
 	
-	// 등록버튼 클릭 이벤트
+	// 이력추가 버튼 이벤트 
-	$('.regBtn').on('click', function(){
-
-		// click한 row의 차수
-		var nowAdrSn = $.trim($(this).parents().parents().children("td:first").text());
-		$('#nowAdrSn').val(nowAdrSn);
-		
-		$('#prtclSeq').val($(this).data('info'));
-        commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/drtRegPop.do", '820', '600', "adjReqMgrPastProgPop", $('#popPageForm'));
-		
-	});
-	
-	$('.updBtn').on('click', function(){
-		
-		$('#prtclSeq').val($(this).data('info'));
-		
-        commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/drtUpdtPop.do", '820', '600', "adjReqMgrPastProgPop", $('#popPageForm'));
-	});
-	
 	$('#btnAdd').on('click', function(){
-		var len = $('#rowTbody').children('tr').length;
+		var len = fn_DuplChk();
 		$('#rowTbody').append(fn_addRow(len));
 	});
+
 	
+	$('#prevPage').on('click', function(){
+		$('#goPageForm').attr('action', '/kccadr/adjReqMgOff/adjReqMgrPastFileRegist.do');
+		$('#goPageForm').submit();
+	});
 });
 
+// 달력 input 중복 방지
+// 마지막 row의 달력 id를 가져옴
+// 가져온 id+1 함
+function fn_DuplChk(){
 
-
+	var endLen = '';
-
+	
+	$('.trClass').each(function(index, item){
+		endLen = $(item).find('.appDeDay').attr('id');
+	});
+	var result = endLen.replace(/[^0-9]/g, "");
+	var len = '';
+	if(result === '')
+	{
+		len = 1;
+	}
+	else
+	{
+		len = Number(result)+1
+	}
+	return len;
+	
+}
 
 function fn_nextGoPageForm(){
 
@@ -116,68 +81,206 @@ function fn_nextGoPageForm(){
 }
 
 $(document).on('click','.removeBtn', function(){
+	var len = $('#rowTbody').children('tr').length;
+	
+	if(len === 1)
+	{
+		alert('하나 이상은 등록해 주세요');
+		return false;
+	}
+	
+	// row remove 하기전 seq 체크해서 delete 처리
+	var seq = $(this).parents('tr').find('#seq').val();
+	if(seq !== undefined)
+	{
+		fn_ajaxDelete(seq);
+	}
 	$(this).parents('tr').remove();
+	
 });
 
 
+function fn_ajaxDelete(seq){
+
+	if(confirm("삭제하시겠습니까?")){
+	
+		$('#adrHstrySeq').val(seq);
+		
+		var form = document.deleteForm;
+		var data = new FormData(form);
+		
+		$.ajax({
+	        type: "POST",
+	        url: "<c:url value='/kccadr/adjReqMgOff/deleteAdjReqRecordAjax.do' />",
+	        data: data,
+	        dataType:'json',
+	        async: false,
+	        processData: false,
+	        contentType: false,
+	        cache: false,
+	        success: function (data) {
+	            console.log('data : ', data);
+				if(data.status == 'OK'){
+					alert(data.data);
+					$('#adrHstrySeq').val('');
+				}
+	            else if(data.status == 'Unauthorized')
+	            {	
+	                alert(data.message);
+	                return false;
+	            }
+			},
+	        error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); }
+	    });
+	
+	}
+	
+	
+	
+};
+
 function fn_addRow(len){
 
-	return addRow= '<tr id="row'+len+'">'
+	return addRow= '<tr class="trClass">'
-				+'	<td>'
+					+'	<td>'
-				+'		<div class="sel_date">'
+					+'		<div class="sel_date">'
-				+'			<input type="text" class="appDeDay inp" title="검색시작일" id="appDeDay'+len+'" name="appDeDay1"  onclick="return calendarOpen(\'appDeDay'+len+'-lry\',\'\',this)" value="<c:out value="${apmChgInfo.appDeDay }"></c:out>" data-datecontrol="true" onkeyup="setFormat(\'day\',this)"  maxlength="10" readonly>'
+					+'			<input type="text" class="appDeDay inp" title="검색시작일" id="appDeDay'+len+'" name="appDeDay1"  onclick="return calendarOpen(\'appDeDay'+len+'-lry\',\'\',this)" value="<c:out value="${apmChgInfo.appDeDay }"></c:out>" data-datecontrol="true" onkeyup="setFormat(\'day\',this)"  maxlength="10" readonly>'
-				+'			<div class="calendar_in" id="calendarName_startDate" style="z-index: 9;">'
+					+'			<div class="calendar_in" id="calendarName_startDate" style="z-index: 9;">'
-				+'				<button type="button" value="달력 팝업 열기" onclick="return calendarOpen(\'appDeDay'+len+'-lry\',\'\',this)" class="btn_cal"></button>'
+					+'				<button type="button" value="달력 팝업 열기" onclick="return calendarOpen(\'appDeDay'+len+'-lry\',\'\',this)" class="btn_cal"></button>'
-				+'				<div id="appDeDay'+len+'-lry" class="calendarPop" style="display: none;">'
+					+'				<div id="appDeDay'+len+'-lry" class="calendarPop" style="display: none;">'
-				+'					<iframe id="appDeDay'+len+'-ifrm" name="appDeDay'+len+'-ifrm" class="calendar-frame" src="/kccadrPb/adm/calendar.html" title=" 달력 팝업" frameborder="0" scrolling="no"></iframe>'
+					+'					<iframe id="appDeDay'+len+'-ifrm" name="appDeDay'+len+'-ifrm" class="calendar-frame" src="/kccadrPb/adm/calendar.html" title=" 달력 팝업" frameborder="0" scrolling="no"></iframe>'
-				+'				</div>'
+					+'				</div>'
-				+'			</div>'
+					+'			</div>'
-				+'		</div>'
+					+'		</div>'
-				+'	</td>'
+					+'	</td>'
-				+'	<td>'
+					+'	<td>'
-				+'		<input type="text" id="" name="" placeholder="내용을 입력해 주세요" value="" />'
+					+'		<input type="text" id="hstryCn" placeholder="내용을 입력해 주세요" value="" />'
-				+'	</td>'
+					+'	</td>'
-				+'	<td>'
+					+'	<td>'
-				+'		<input type="text" id="" name="" placeholder="비고를 입력해 주세요" value="" />'
+					+'		<input type="text" id="hstryDetailCn" placeholder="비고를 입력해 주세요" value="" />'
-				+'	</td>'
+					+'	</td>'
-				+'	<td>'
+					+'	<td>'
-				+'		<button type="button" class="btnType04 btn_del removeBtn">삭제</button>'
+					+'		<button type="button" class="btnType04 btn_del removeBtn">삭제</button>'
-				+'	</td>'
+					+'	</td>'
 				+'</tr>'
 				;
 }
 
+/*  
+ *	등록버튼 
+ */
+$(document).on('click','#regBtn', function(){
+
+	if(!validate())
+	{
+		return false;
+	}
+	
+	$('.adrHstryList').remove();
+	var sendHtml = '';	
+	$('.trClass').each(function(index, item){
+		// init
+		sendHtml = '';
+		
+		if($(item).find('#seq').length != 0)
+		{
+			sendHtml += $(item).find('#seq').val()+'|';
+		}
+		else
+		{
+			sendHtml += '|';
+		}
+		
+		sendHtml +=  $(item).find('.appDeDay').val()+'|';
+		sendHtml +=  $(item).find('#hstryCn').val()+'|';
+		sendHtml +=  $(item).find('#hstryDetailCn').val()+'|';
+		sendHtml = '<input type="hidden" class="adrHstryList" name="adrHstryList" value="'+sendHtml+'" />'
+		
+		$('#regPageForm').append(sendHtml);		
+	});
+	
+
+	
+	if(confirm("조정신청 정보 등록을 진행하시겠습니까?")){
+		
+		var form = document.regPageForm;
+		var data = new FormData(form);
+		
+		$.ajax({
+	        type: "POST",
+	        url: "<c:url value='/kccadr/adjReqMgOff/saveAdjReqRecordAjax.do' />",
+	        data: data,
+	        dataType:'json',
+	        async: false,
+	        processData: false,
+	        contentType: false,
+	        cache: false,
+	        success: function (data) {
+                console.log('data : ', data);
+				if(data.status == 'OK'){
+					alert(data.data);
+// 					$('#adrSeq').val(data.dataSub);
+// 					$('#nextGoPageForm').submit();
+				}
+                else if(data.status == 'Unauthorized')
+                {	
+                    alert(data.message);
+                    return false;
+                }
+			},
+	        error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); }
+	    });
+	}
+});
+
+function validate(){
+	
+	$('.trClass').each(function(index, item){
+		// init
+		if($(item).find('.appDeDay').val() == '')
+		{
+			alert("일자를 선택해 주세요");
+			$(item).find('.appDeDay').focus();
+			return false;
+		}
+		if($(item).find('#hstryCn').val() == '')
+		{
+			alert("내용을 입력해 주세요");
+			$(item).find('#hstryCn').focus();
+			return false;
+		}
+		
+	});
+	
+}
+
 
 </script>
 <style type="text/css">
-.calendarPop {left:-165px;}
+	.calendarPop {left:-165px;}
-.cont .list {overflow:inherit;min-height:auto;border-bottom:0 none;}
+	.cont .list {overflow:inherit;min-height:auto;border-bottom:0 none;}
-.cont .list.tbType01 tbody tr td {padding:10px 15px;}
+	.cont .list.tbType01 tbody tr td {padding:10px 15px;}
-.cont .list.tbType01 tbody tr td input[type=text] {width:100%;box-sizing:border-box;}
+	.cont .list.tbType01 tbody tr td input[type=text] {width:100%;box-sizing:border-box;}
-.cont .list.tbType01 tbody tr td .sel_date {position:relative;}
+	.cont .list.tbType01 tbody tr td .sel_date {position:relative;}
-.cont .list.tbType01 tbody tr td .sel_date .startDate {width:100%;box-sizing:border-box;}
+	.cont .list.tbType01 tbody tr td .sel_date .startDate {width:100%;box-sizing:border-box;}
-.cont .list.tbType01 tbody tr td .sel_date .calendar_in {position:absolute;right:0;top:8px;}
+	.cont .list.tbType01 tbody tr td .sel_date .calendar_in {position:absolute;right:0;top:8px;}
-.cont .list.tbType01 tbody tr td.upload_area {text-align:left;}
+	.cont .list.tbType01 tbody tr td.upload_area {text-align:left;}
-.cont .list.tbType01 tbody tr td.upload_area .btnType01 {height:36px;padding:0 11px;font-size:15px;}
+	.cont .list.tbType01 tbody tr td.upload_area .btnType01 {height:36px;padding:0 11px;font-size:15px;}
 </style>
 <title>사건진행정보</title>
 </head>
 <body>
 
-<form id="popPageForm" name="popPageForm" method="post">
+<form id="regPageForm" name="regPageForm" method="post">
-	<input type="hidden" id="prtclSeq" name="prtclSeq" value="" /> 
+	<input type="hidden" id="adrSeq" name="adrSeq" value="${adjReqMgrPastVO.adrSeq }">
-	<input type="hidden" id="nowAdrSn" name="nowAdrSn" value="" /> 
+</form>
-<%-- 	<input type="hidden" id="adrSeq" name="adrSeq" value="<c:out value="${info.adrSeq}" />" /> --%>
+
-<%-- 	<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn}" />" /> --%>
+<form id="goPageForm" name="goPageForm" method="post">
-<%-- 	<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" /> --%>
+	<input type="hidden" id="adrSeq" name="adrSeq" value="${adjReqMgrPastVO.adrSeq }">
-<!-- 	<input type="hidden" id="rpplTy" name="rpplTy" /> -->
+</form>
-<%-- 	<input type="hidden" id="adrEndDeDay" name="adrEndDeDay" value="<c:out value="${info.adrEndDeDay}" />" /> --%>
+
-<%-- 	<input type="hidden" id="appSeq" name="appSeq" value="<c:out value="${info.appSeq}" />" /> --%>
+<form id="deleteForm" name="deleteForm" method="post">
-<!-- 	<input type="hidden" id="closeDocTy" name="closeDocTy" /> -->
+	<input type="hidden" id="adrHstrySeq" name="adrHstrySeq" value="">
-<%-- 	<input type="hidden" id="adrAvoidSeq" name="adrAvoidSeq"  value="<c:out value="${info.adrAvoidSeq}" />" /> --%>
-<%-- 	<input type="hidden" id="agntSeq" name="agntSeq"  value="<c:out value="${info.agntSeq}" />" /> --%>
-	<%-- <input type="hidden" id="adrMaxSn" name="adrMaxSn"  value="<c:out value="${adrMaxSn}" />" /> --%>
-	<input type="hidden" id="rpplSeq" name="rpplSeq" value=""/>
 </form>
 
 	<div class="cont_wrap">
@@ -202,9 +305,9 @@ function fn_addRow(len){
 			<div class="cont">
 				<!-- list_top -->
 				<div class="list_top">
-					<p>총 진행 회차 : <span><c:out value="${fn:length(adjReqMgrPastListVO) }"/></span>건</p>
+					<p><%-- 총 진행 회차 : <span><c:out value="${fn:length(adrHstryList)}"/></span>건 --%></p>
 					<div class="btn_wrap">
-						<button type="button" id="btnAdd" class="btnType06 btn_adj_add btn_add">문서 추가</button>
+						<button type="button" id="btnAdd" class="btnType06 btn_adj_add btn_add">이력 추가</button>
 					</div>
 				</div>
 				<!-- //list_top -->
@@ -226,56 +329,59 @@ function fn_addRow(len){
 						</tr>
 						</thead>
 						<tbody id="rowTbody">
-<%-- 							<c:forEach items="${adjReqMgrPastListVO }" var="adjPast"> --%>
+							<c:choose>
-<!-- 								<tr> -->
+								<c:when test="${fn:length(adrHstryList) != 0}">
-<!-- 									<td> -->
+									<c:forEach items="${adrHstryList }" var="adrHstry">
-<%-- 										<c:out value="${adjPast.adrSn }" /> --%>
+										<tr class="trClass">
-<!-- 									</td> -->
+											<input type="hidden" id="seq" value="${adrHstry.adrHstrySeq }" />
-<!-- 									<td> -->
+											<td>
-<%-- 										<c:choose> --%>
+												<div class="sel_date">
-<%-- 											<c:when test="${empty adjPast.prtclCn  }"> --%>
+													<input type="text" value="${adrHstry.hstryDe }" class="appDeDay inp" title="검색시작일" id="appDeDay" name="appDeDay"  onclick="return calendarOpen('appDeDay-lry','',this)" value="<c:out value="${apmChgInfo.appDeDay }"></c:out>" data-datecontrol="true" onkeyup="setFormat('day',this)"  maxlength="10" readonly>
-<!-- 												해당 차수의 정보를 등록해 주세요 -->
+													<div class="calendar_in" id="calendarName_startDate" style="z-index: 9;">
-<%-- 											</c:when> --%>
+														<button type="button" value="달력 팝업 열기" onclick="return calendarOpen('appDeDay-lry','',this)" class="btn_cal"></button>
-<%-- 											<c:otherwise> --%>
+														<div id="appDeDay-lry" class="calendarPop" style="display: none;">
-<%-- 												<c:out value="${adjPast.appResultTx }"/> --%>
+															<iframe id="appDeDay-ifrm" name="appDeDay-ifrm" class="calendar-frame" src="/kccadrPb/adm/calendar.html" title=" 달력 팝업" frameborder="0" scrolling="no"></iframe>
-<%-- 											</c:otherwise> --%>
+														</div>
-<%-- 										</c:choose> --%>
+													</div>
-<!-- 									</td> -->
+												</div>
-<!-- 									<td> -->
+											</td>
-<%-- 										<c:choose> --%>
+											<td>
-<%-- 											<c:when test="${empty adjPast.prtclCn  }"> --%>
+												<input type="text" value="${adrHstry.hstryCn }" id="hstryCn" placeholder="내용을 입력해 주세요" value="" />
-<!-- 												<button class="btn_search regBtn">등록</button> -->
+											</td>
-<%-- 											</c:when> --%>
+											<td>
-<%-- 											<c:otherwise> --%>
+												<input type="text" value="${adrHstry.hstryDetailCn }" id="hstryDetailCn" name="" placeholder="비고를 입력해 주세요" value="" />
-<%-- 												<button class="btn_search updBtn" data-info="${adjPast.prtclSeq }">수정</button> --%>
+											</td>
-<%-- 											</c:otherwise> --%>
+											<td>
-<%-- 										</c:choose> --%>
+												<button type="button" class="btnType04 btn_del removeBtn">삭제</button>
-<!-- 									</td> -->
+											</td>
-<!-- 								</tr> -->
+										</tr>
-<%-- 							</c:forEach> --%>
+									</c:forEach>
-							<tr>
+								</c:when>
-								<td>
+								<c:otherwise>
-<!-- 									<input type="text" id="" name="" style="width: 125px;" placeholder="YYYY-MM-DD" value="" /> -->
+									<tr class="trClass">
-									<div class="sel_date">
+										<td>
-										<input type="text" class="appDeDay inp" title="검색시작일" id="appDeDay" name="appDeDay1"  onclick="return calendarOpen('appDeDay-lry','',this)" value="<c:out value="${apmChgInfo.appDeDay }"></c:out>" data-datecontrol="true" onkeyup="setFormat('day',this)"  maxlength="10" readonly>
+											<div class="sel_date">
-										<div class="calendar_in" id="calendarName_startDate" style="z-index: 9;">
+												<input type="text" class="appDeDay inp" title="검색시작일" id="appDeDay" name="appDeDay"  onclick="return calendarOpen('appDeDay-lry','',this)" value="<c:out value="${apmChgInfo.appDeDay }"></c:out>" data-datecontrol="true" onkeyup="setFormat('day',this)"  maxlength="10" readonly>
-											<button type="button" value="달력 팝업 열기" onclick="return calendarOpen('appDeDay-lry','',this)" class="btn_cal"></button>
+												<div class="calendar_in" id="calendarName_startDate" style="z-index: 9;">
-											<div id="appDeDay-lry" class="calendarPop" style="display: none;">
+													<button type="button" value="달력 팝업 열기" onclick="return calendarOpen('appDeDay-lry','',this)" class="btn_cal"></button>
-												<iframe id="appDeDay-ifrm" name="appDeDay-ifrm" class="calendar-frame" src="/kccadrPb/adm/calendar.html" title=" 달력 팝업" frameborder="0" scrolling="no"></iframe>
+													<div id="appDeDay-lry" class="calendarPop" style="display: none;">
+														<iframe id="appDeDay-ifrm" name="appDeDay-ifrm" class="calendar-frame" src="/kccadrPb/adm/calendar.html" title=" 달력 팝업" frameborder="0" scrolling="no"></iframe>
+													</div>
+												</div>
 											</div>
-										</div>
+										</td>
-									</div>
+										<td>
-								</td>
+											<input type="text" id="hstryCn" placeholder="내용을 입력해 주세요" value="" />
-								<td>
+										</td>
-									<input type="text" id="" name="" placeholder="내용을 입력해 주세요" value="" />
+										<td>
-								</td>
+											<input type="text" id="hstryDetailCn" name="" placeholder="비고를 입력해 주세요" value="" />
-								<td>
+										</td>
-									<input type="text" id="" name="" placeholder="비고를 입력해 주세요" value="" />
+										<td>
-								</td>
+											<button type="button" class="btnType04 btn_del removeBtn">삭제</button>
-								<td>
+										</td>
-									<button type="button" class="btnType04 btn_del removeBtn">삭제</button>
+									</tr>
-								</td>
+								</c:otherwise>
-							</tr>
+							</c:choose>
 						</tbody>
 					</table>
 				</div>
@@ -283,17 +389,15 @@ function fn_addRow(len){
 				<!-- //page -->
 				<div class="btn_wrap btn_layout01">
 					<div class="area_left">
+						<button type="button" id="prevPage" class="btnType04">&lt; 이전단계 이동</button>
 					</div>
 					<div class="area_right">
-						<button type="button" class="btnType06" onclick="fn_nextGoPageForm(); return false;">다음 단계 ></button>
+						<button type="button" id="regBtn" class="btnType06">다음단계 이동 &gt;</button>
 					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-	<form id="nextGoPageForm" action="<c:url value='/kccadr/adjReqMgOff/adjReqMgrPastFileRegist.do' />">
-		<input id="adrSeq" name="adrSeq" value="${adjReqMgrPastVO.adrSeq }">
-	</form>
 	<!-- //cont -->
 <!-- //cont -->
 

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

@@ -1,17 +1,16 @@
 
 // 예문 팝업 function
-
 function openExampleAdminPop(exmpCd) {
-	console.log('exmpCd : ', exmpCd);
 	
 	var pop = document.pop;
 	pop.ccTy.value = $('#ccTy').val();
 	pop.exmpCd.value = exmpCd;
 		
-	commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.do", '500', '400', "openExampleAdminPop", $('#pop'));
+	commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.do", '600', '400', "openExampleAdminPop", $('#pop'));
 }
 
 
+
     /* 
         최종결과 선택에 따른 액션   
         00 -> 종결
@@ -33,16 +32,14 @@ function openExampleAdminPop(exmpCd) {
     
     /* 
         최종결과 선택에 따른 액션   
-        00 -> 종결
-        40 -> 조정취하
     */
     $(document).on('change', '#detailResult', function(){
         
         var thisVal = $(this).val();
         $('#statCd').val(thisVal);
     });
-    
 
+	
 
     //피신청인 삭제버튼 클릭
     $(document).on('click', '.reqPerDel', function(){

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

@@ -8,7 +8,7 @@
         $('#lastUpdtPnttm').val($('#endDate').val());
         $('#adrSn').val($('#adrSnTemp').val());
         $('#memDeptNm').val($('#memDeptNmTemp').val());
-        $('#assPstUsrNm').val($('#assPstUsrNmTemp').val());
+        $('#assPstUsrNm').val($('#assPstUsrNmTemp').val()); 
 
 
         
@@ -1062,15 +1062,50 @@
 			
 		}
 		
-		if(confirm("조정신청 정보 등록을 진행하시겠습니까?")){
+		if($('#pstCn') == ""){
+			alert("조정결과를 입력해 주세요");
+			return false;
+		}
+		
+		if($('#statCd') == ""){
+			alert("최종결과를 선택해 주세요");
+			return false;
+		}
+		
+		if($('#assPstUsrNm') == ""){
+			alert("조정조사관을 입력해 주세요");
+			return false;
+		}
+		
+		if($('#assPstUsrNm') == ""){
+			alert("조정부를 입력해 주세요");
+			return false;
+		}
+		
+		var msg = "";
+		var url = "";
+		
+		
+		if($('#adrSeq').val() != null)
+		{
+			msg= "조정신청 정보 수정을 진행하시겠습니까?";
+	        url= "/kccadr/adjReqMgOff/updateAdjReqMgrOffAjax.do";
+		}
+		else{
+			msg= "조정신청 정보 등록을 진행하시겠습니까?";
+	        url= "/kccadr/adjReqMgOff/insertAdjReqMgrPastAjax.do";
+			
+		}
+		
+		
+		if(confirm(msg)){
 			//신청인 정보 입력
 			var data = new FormData(form);
-			
 
-			
+
 			$.ajax({
 		        type: "POST",
-		        url: "/kccadr/adjReqMgOff/insertAdjReqMgrPastAjax.do",
+		        url: url,
 		        data: data,
 		        dataType:'json',
 		        async: false,
@@ -1081,8 +1116,8 @@
                     console.log('data : ', data);
 					if(data.status == 'OK'){
 						alert(data.data);
-						$('#adrSeq').val(dataSub);
+						$('#adrSeq').val(data.dataSub);
-						$('#nextGoPageForm').submit();
+//						$('#nextGoPageForm').submit();
 					}
                     else if(data.status == 'Unauthorized')
                     {