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

src/main/java/kcc/kccadr/accdnt/ai/web/AdjstIncidentController.java

@@ -231,6 +231,38 @@ public class AdjstIncidentController {
 		return "/web/kccadr/accdnt/ai/adjstIncidentDetail";
 	}
 	
+	/**
+	 * 조정사건 상세페이지
+	 * @param adjstIncidentVO AdjstIncidentVO
+	 * @return String
+	 * @exception Exception
+	 */
+	@RequestMapping(value = "/web/kccadr/accdnt/ai/adjstIncidentEndDetail.do")
+	public String adjstIncidentEndDetail(@ModelAttribute("adjstIncidentVO") AdjstIncidentVO adjstIncidentVO , ModelMap model) throws Exception {
+		AdjstIncidentVO master = adjstIncidentService.selectAdjstIncidentMaster(adjstIncidentVO);
+		model.addAttribute("master", master);
+
+		List<AdjstIncidentVO> relatedPerson = adjstIncidentService.selectAdjstIncidentrelatedPersonList(adjstIncidentVO);
+		decryptInfomation(relatedPerson, null);
+		model.addAttribute("relatedPerson", relatedPerson);
+		
+		List<AdjstIncidentVO> piSinList = new ArrayList<AdjstIncidentVO>();
+		for(AdjstIncidentVO tmpVO : relatedPerson) {
+			if("20".equals(tmpVO.getRpplTy())) {
+				piSinList.add(tmpVO);
+			}
+		}
+		model.addAttribute("piSinList", piSinList);
+		
+		if(StringUtils.isNotBlank(master.getAtchFileId())){
+			FileVO fileVO = new FileVO();
+			fileVO.setAtchFileId(master.getAtchFileId());
+			List<FileVO> fileList = fileService.selectFileInfs(fileVO);
+			model.addAttribute("fileList", fileList);
+		}
+		return "/web/kccadr/accdnt/ai/adjstIncidentEndDetail";
+	}
+
 	@RequestMapping(value = "/web/kccadr/accdnt/ai/popup/adjstIncidentReqViewPop.do")
 	public String adjstIncidentReqViewPop(@ModelAttribute("adjstIncidentVO") AdjstIncidentVO adjstIncidentVO , ModelMap model) throws Exception {
 		AdjReqMgrVO param = new AdjReqMgrVO();
@@ -349,6 +381,59 @@ public class AdjstIncidentController {
 		return "/web/kccadr/accdnt/ai/adjstIncidentRequest";
 	}
 	
+	/**
+	 * 조정사건 목록 화면
+	 */
+	@RequestMapping("/web/kccadr/accdnt/ai/adjstIncidentEndList.do")
+	public String adjstIncidentEndList(@ModelAttribute("adjstIncidentVO") AdjstIncidentVO adjstIncidentVO, ModelMap model, HttpServletRequest request) throws Exception {
+
+		String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString();
+		LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
+		
+		if (loginVO == null) {
+
+			model.addAttribute("msg", "로그인 해주세요.");
+			return "redirect:/web/user/login/ssoLogin.do";
+		}
+		
+		adjstIncidentVO.setFrstRegisterId(loginVO.getUniqId());
+
+		if(adjstIncidentVO.getPageUnit() != 10) {
+			adjstIncidentVO.setPageUnit(adjstIncidentVO.getPageUnit());
+		}
+
+		if("".equals(adjstIncidentVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
+			adjstIncidentVO.setSearchSortCnd("RS.ADR_SEQ");
+			adjstIncidentVO.setSearchSortOrd("desc");
+		}
+		
+		//종결 사건 검색 조건
+		adjstIncidentVO.setSearchStatus("C");
+
+		// 키워드가 있다면 일단 암호화 하여 암호화 컬럼에 셋
+		if(StringUtils.isNotBlank(adjstIncidentVO.getSearchKeyword())){
+			adjstIncidentVO.setSearchEncKeyword(egovCryptoUtil.encrypt(adjstIncidentVO.getSearchKeyword()));
+		}
+
+		/** paging */
+		PaginationInfo paginationInfo = new PaginationInfo();
+		paginationInfo.setCurrentPageNo(adjstIncidentVO.getPageIndex());
+		paginationInfo.setRecordCountPerPage(adjstIncidentVO.getPageUnit());
+		paginationInfo.setPageSize(adjstIncidentVO.getPageSize());
+
+		adjstIncidentVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+		adjstIncidentVO.setLastIndex(paginationInfo.getLastRecordIndex());
+		adjstIncidentVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+
+		paginationInfo.setTotalRecordCount(adjstIncidentService.selectAdjstIncidentCount(adjstIncidentVO));
+		model.addAttribute("paginationInfo", paginationInfo);
+		List<AdjstIncidentVO> list = adjstIncidentService.selectAdjstIncidentList(adjstIncidentVO);
+		decryptInfomation(list, null);
+		model.addAttribute("list", list);
+
+		return "/web/kccadr/accdnt/ai/adjstIncidentEndList";
+	}
+
 	public void decryptInfomation(List<AdjstIncidentVO> list, AdjstIncidentVO info){
 		if(CollectionUtils.isNotEmpty(list)){
 			for(AdjstIncidentVO model : list){

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

@@ -76,6 +76,7 @@ import kcc.kccadr.adjst.service.AdjstReqVO;
 import kcc.kccadr.advc.service.AdrHstryMgrService;
 import kcc.kccadr.advc.service.AdrHstryMgrVO;
 import kcc.kccadr.cmm.KccadrConstants;
+import kcc.kccadr.cmm.service.SMSOracleService;
 import kcc.kccadr.kccadrCom.service.KccadrCommonSearchVO;
 import kcc.kccadr.kccadrCom.service.KccadrCommonService;
 import kcc.kccadr.kccadrCom.service.KccadrCommonVO;
@@ -207,6 +208,10 @@ public class ApmController {
     @Value("#{globalSettings['Globals.prod.islocal']}")
     public void setIslocal(String path) { islocal = path; }
     
+	// SMS 문자발송 서비스
+	@Resource(name = "SMSOracleService")
+	private SMSOracleService sMSOracleService;
+    
     /**
      * 조정진행목록 목록
      *
@@ -841,69 +846,112 @@ public class ApmController {
     
     
     
-    	/**
+	/**
-         * 사건메모 팝업 상세
+     * 사건메모 팝업 상세
-         *
+     *
-         * @param apmVO
+     * @param apmVO
-         * @param model
+     * @param model
-         * @return
+     * @return
-         * @throws Exception
+     * @throws Exception
-         */
+     */
-        @RequestMapping(value = "popup/adrMemo.do")
+    @RequestMapping(value = "popup/adrMemo.do")
-        public String adrMemo(@ModelAttribute("apmVO") ApmVO apmVO, ModelMap model) throws Exception {
+    public String adrMemo(@ModelAttribute("apmVO") ApmVO apmVO, ModelMap model) throws Exception {
     	
-        	//이미 있는메모 정보가져오는 쿼리작성(adr_mgr_master > adr_cn 컬럼)
+    	//이미 있는메모 정보가져오는 쿼리작성(adr_mgr_master > adr_cn 컬럼)
-        	//등록,수정(merge into)
+    	//등록,수정(merge into)
-        	//삭제(update > '')
+    	//삭제(update > '')
-        	//한 팝업에서 동작
+    	//한 팝업에서 동작
     	
-        	ApmVO memoVO = new ApmVO();
+    	ApmVO memoVO = new ApmVO();
     	
-        	memoVO = apmService.selectAdrMemo(apmVO);
+    	memoVO = apmService.selectAdrMemo(apmVO);
     	
-        	model.addAttribute("apmVO", apmVO);
+    	model.addAttribute("apmVO", apmVO);
-        	model.addAttribute("memoVO", memoVO);
+    	model.addAttribute("memoVO", memoVO);
     	
-            return "/kccadr/adjPgrMgr/apm/popup/adrMemoPop";
+        return "/kccadr/adjPgrMgr/apm/popup/adrMemoPop";
-        }
+    }
     
-        /**
+    /**
-         * 사건메모 등록/수정/삭제
+     * 사건메모 등록/수정/삭제
-         *
+     *
-         * @param apmVO
+     * @param apmVO
-         * @param model
+     * @param model
-         * @return
+     * @return
-         * @throws Exception
+     * @throws Exception
-         */
+     */
-        @RequestMapping(value = "popup/updateAdrMemoAjax.do")
+    @RequestMapping(value = "popup/updateAdrMemoAjax.do")
-        public ModelAndView updateAdrMemoAjax(
+    public ModelAndView updateAdrMemoAjax(
-        		@ModelAttribute("apmVO") ApmVO apmVO
+    		@ModelAttribute("apmVO") ApmVO apmVO
-                , ModelMap model
+            , ModelMap model
-                , HttpServletRequest request) throws Exception {
+            , HttpServletRequest request) throws Exception {
         
-            ModelAndView modelAndView = new ModelAndView();
+        ModelAndView modelAndView = new ModelAndView();
-            modelAndView.setViewName("jsonView");
+        modelAndView.setViewName("jsonView");
         
-            LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
+        LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
-            String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
+        String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
         
-            try {
+        try {
-            	//최종수정자 set
+        	//최종수정자 set
-            	apmVO.setLastUpdusrId(userId);
+        	apmVO.setLastUpdusrId(userId);
         	
-            	//등록, 수정, 삭제 모두 update
+        	//등록, 수정, 삭제 모두 update
-            	apmService.updateAdrMemo(apmVO);
+        	apmService.updateAdrMemo(apmVO);
         	
-            	modelAndView.addObject("result", "success");
+        	modelAndView.addObject("result", "success");
 			
-    		} catch (Exception e) {
+		} catch (Exception e) {
-    			System.out.println(e.getMessage());
+			System.out.println(e.getMessage());
-    			modelAndView.addObject("result", "fail");
+			modelAndView.addObject("result", "fail");
-    		}
+		}
         
-            return modelAndView;
+        return modelAndView;
+                
+    }
+    
+	/**
+     * 문자발송 팝업
+     *
+     * @param apmVO
+     * @param model
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "popup/smsSendPop.do")
+    public String adrMemo(@ModelAttribute("adjReqMgrVO") AdjReqMgrVO adjReqMgrVO) throws Exception {
+    	
+        return "/kccadr/adjPgrMgr/apm/popup/smsSendPop";
+    }
+    
+    
+    /**
+     * 문자발송 팝업
+     *
+     * @param apmVO
+     * @param model
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "smsSendAjax.do")
+    public ModelAndView smsSendAjax(@ModelAttribute("adjReqMgrVO") AdjReqMgrVO adjReqMgrVO
+						    		, RedirectAttributes redirectAttributes
+									, HttpServletRequest request ) throws Exception {
+    	
+    	ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+		try {
+			String result = sMSOracleService.insertSmsCustomSend(adjReqMgrVO);
+			
+			modelAndView.addObject("result", result);
+		}catch (Exception e) {
+			modelAndView.addObject("result", "fail");
+			modelAndView.addObject("message", "문자발송 요청에 실패했습니다.");
+		}
+    	
+        return modelAndView;
+    }
     
-        }
     
     
     /**

src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java

@@ -100,6 +100,7 @@ public class AdjReqMgrOffLineVO  extends ComDefaultVO implements Serializable {
 	// 조정기일대리인
 //	private String adrSeq = ""; // 조정일련번호
 	private String adrSn = ""; // 조정회차
+	private String adrSnChgYn = ""; // 조정회차
 	private String agntSeq = ""; // 대리인일련번호
 //	private String rpplSeq = ""; // 대리신청_관련인일련번호
 	private String agntSbmtYn = ""; // 조정대리신청제출여부
@@ -165,6 +166,9 @@ public class AdjReqMgrOffLineVO  extends ComDefaultVO implements Serializable {
 	private String adrHstrySeq; 
 	private String pstCn; 
 	
+	
+	
+	
 	public AdjReqMgrVO getAdrVO() {
 		return adrVO;
 	}
@@ -824,6 +828,12 @@ public class AdjReqMgrOffLineVO  extends ComDefaultVO implements Serializable {
 	public void setPstCn(String pstCn) {
 		this.pstCn = pstCn;
 	}
+	public String getAdrSnChgYn() {
+		return adrSnChgYn;
+	}
+	public void setAdrSnChgYn(String adrSnChgYn) {
+		this.adrSnChgYn = adrSnChgYn;
+	}
 	
 	
 	

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

@@ -40,6 +40,10 @@ public interface AdjReqMgrPastService {
 
 	AdjReqMgrPastVO findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO);
 
-	void updateAdjReqMgrEtc(AdjReqMgrPastVO adjReqMgrPastVO) throws FdlException;
+	void updateAdjReqMgrEtc(AdjReqMgrOffLineVO adjReqMgrOffLineVO) throws FdlException;
+
+	List<AdjReqMgrPastVO> selectAdjReqMgrPastList(AdjReqMgrPastVO adjReqMgrPastVO);
+
+	int selectAdjReqMgrPastListCount(AdjReqMgrPastVO adjReqMgrPastVO);
 	
 }

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

@@ -52,6 +52,7 @@ public class AdjReqMgrPastVO  extends ComDefaultVO implements Serializable {
 	private String adrSeq = ""; // 조정일련번호
 	private String adrNo = ""; // 조정사건번호
 	private String statCd = ""; // 조정사건상태
+	private String statTx = ""; // 조정사건상태
 	private String reqOlCd = ""; // 온_오프라인_신청구분
 	private String reqCn1 = ""; // 신청취지
 	private String reqCn2 = ""; // 신청원인
@@ -85,6 +86,8 @@ public class AdjReqMgrPastVO  extends ComDefaultVO implements Serializable {
 	private String adrOlYn = ""; // 전자조정진행여부
 	private String rpplId = ""; // 조정사건관리인ID
 	private String rpplNm = ""; // 이름_대표자
+	private String PrpplNm = ""; // 이름_대표자
+	private long pRpplCnt = 0; // 
 	private String rpplBizId = ""; // 법인등록번호
 	private String rpplBizNo = ""; // 개인사업자번호
 	private String rpplBizNm = ""; // 법인_사업체명
@@ -121,6 +124,7 @@ public class AdjReqMgrPastVO  extends ComDefaultVO implements Serializable {
     // 조정기일대리인
     private String addUsrNmList[]; /* ass.agntSeq | ass.assUsrTy | add_yn " */
 	private String adrSn = ""; // 조정회차
+	private String adrSnChgYn = ""; // 조정회차
 	private String agntSeq = ""; // 대리인일련번호
 	private String agntSbmtYn = ""; // 조정대리신청제출여부
 	private String agntApprYn = ""; // 조정대리승인여부
@@ -148,6 +152,7 @@ public class AdjReqMgrPastVO  extends ComDefaultVO implements Serializable {
 	private String reqPerTotCnt = ""; //피신청인 총 갯수
 	private String rpplAtchFileId = "";	//대리인 첨부파일 아이디
 	private String rpplMgrAtchFileId = "";	//조정신청 첨부파일 아이디
+	private String adrEndDe = "";	// 조장 기간
 
 
 	private String resPonDentNm;
@@ -209,9 +214,20 @@ public class AdjReqMgrPastVO  extends ComDefaultVO implements Serializable {
 	private String refSeq1; // 참고용 일련번호 1
 	private String refSeq2; // 참고용 일련번호 2
 	
-
     private String adrHstryList[];
     
+    private String searchStatCdAll;
+    
+    private String searchCondition2;
+    
+    private String diffYear;
+    
+    
+    
+    
+    private List<String> searchStatCdList = new ArrayList<String>();
+    
+
 	public AdjReqMgrVO getAdrVO() {
 		return adrVO;
 	}
@@ -404,6 +420,14 @@ public class AdjReqMgrPastVO  extends ComDefaultVO implements Serializable {
 		this.statCd = statCd;
 	}
 
+	public String getStatTx() {
+		return statTx;
+	}
+
+	public void setStatTx(String statTx) {
+		this.statTx = statTx;
+	}
+
 	public String getReqOlCd() {
 		return reqOlCd;
 	}
@@ -644,6 +668,22 @@ public class AdjReqMgrPastVO  extends ComDefaultVO implements Serializable {
 		this.rpplNm = rpplNm;
 	}
 
+	public String getPrpplNm() {
+		return PrpplNm;
+	}
+
+	public void setPrpplNm(String prpplNm) {
+		PrpplNm = prpplNm;
+	}
+	
+	public long getpRpplCnt() {
+		return pRpplCnt;
+	}
+
+	public void setpRpplCnt(long pRpplCnt) {
+		this.pRpplCnt = pRpplCnt;
+	}
+
 	public String getRpplBizId() {
 		return rpplBizId;
 	}
@@ -1356,6 +1396,55 @@ public class AdjReqMgrPastVO  extends ComDefaultVO implements Serializable {
 		this.memPstSeq = memPstSeq;
 	}
 
+	public String getAdrEndDe() {
+		return adrEndDe;
+	}
+
+	public void setAdrEndDe(String adrEndDe) {
+		this.adrEndDe = adrEndDe;
+	}
+
+	public String getAdrSnChgYn() {
+		return adrSnChgYn;
+	}
+
+	public void setAdrSnChgYn(String adrSnChgYn) {
+		this.adrSnChgYn = adrSnChgYn;
+	}
+
+	public String getSearchStatCdAll() {
+		return searchStatCdAll;
+	}
+
+	public void setSearchStatCdAll(String searchStatCdAll) {
+		this.searchStatCdAll = searchStatCdAll;
+	}
+
+	public List<String> getSearchStatCdList() {
+		return searchStatCdList;
+	}
+
+	public void setSearchStatCdList(List<String> searchStatCdList) {
+		this.searchStatCdList = searchStatCdList;
+	}
+
+	public String getSearchCondition2() {
+		return searchCondition2;
+	}
+
+	public void setSearchCondition2(String searchCondition2) {
+		this.searchCondition2 = searchCondition2;
+	}
+
+	public String getDiffYear() {
+		return diffYear;
+	}
+
+	public void setDiffYear(String diffYear) {
+		this.diffYear = diffYear;
+	}
+
+	
 	
 //	=============================================
 	

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

@@ -0,0 +1,46 @@
+package kcc.kccadr.adjReqMgrPast.service;
+
+public enum HstryStatEnumVO {
+    CODE305050("조정취하")
+    , CODE304050("조정조서종결(성립)")
+    , CODE307050("불성립종결")
+    , CODE306050("직권조정성립")
+    ;
+	
+	
+	
+
+    private final String label;
+
+    HstryStatEnumVO(String label) {
+        this.label = label;
+    }
+
+    public String label() {
+        return label;
+    }
+
+	/** 
+	 * @methodName	: getStatCdSwitching 
+	 * @author		: 이호영
+	 * @date		: 2022.10.05 
+	 * @description	: Enum type인 HstryStatEnumVO에서 코드별로 텍스트 추출  
+	 * @param statCd
+	 * @return 
+	 */
+	public static String getStatCdSwitching(String statCd) {
+		String statTx = "";
+		if("305050".equals(statCd)) {
+			statTx = HstryStatEnumVO.CODE305050.label();
+		}else if("304050".equals(statCd)) {
+			statTx = HstryStatEnumVO.CODE304050.label();
+		}else if("307050".equals(statCd)) {
+			statTx = HstryStatEnumVO.CODE307050.label();
+		}else if("306050".equals(statCd)) {
+			statTx = HstryStatEnumVO.CODE306050.label();
+		}
+		return statTx;
+		
+	}
+	
+}

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

@@ -147,5 +147,29 @@ public class AdjReqMgrPastDAO  extends EgovAbstractDAO {
 		delete("adjReqMgrPastDAO.deleteAdrPrtclMgrRow", adjReqMgrPastVO );
 	}
 
+	public void updateBasicInfo(AdjReqMgrPastVO adjReqMgrPastVO) {
+		update("adjReqMgrPastDAO.updateBasicInfo", adjReqMgrPastVO );
+	}
+
+	public List<AdjReqMgrPastVO> selectAdjReqMgrPastList(AdjReqMgrPastVO adjReqMgrPastVO) {
+		return (List<AdjReqMgrPastVO>) list("adjReqMgrPastDAO.selectAdjReqMgrPastList", adjReqMgrPastVO);
+	}
+
+	public List<AdjReqMgrPastVO> selectRpplList(AdjReqMgrPastVO adjReqMgrPastVO) {
+		return (List<AdjReqMgrPastVO>) list("adjReqMgrPastDAO.selectRpplList", adjReqMgrPastVO);
+	}
+
+	public String findByIdAdrHstry(AdjReqMgrPastVO adjPastVO) {
+		return (String) select("adjReqMgrPastDAO.findByIdAdrHstry", adjPastVO);
+	}
+
+	public int selectAdjReqMgrPastListCount(AdjReqMgrPastVO adjReqMgrPastVO) {
+		return (int) select("adjReqMgrPastDAO.selectAdjReqMgrPastListCount", adjReqMgrPastVO);
+	}
+
+	public void updateAdrEndDe(AdjReqMgrPastVO adjPastVO) {
+		update("adjReqMgrPastDAO.updateAdrEndDe", adjPastVO);
+	}
+
 	
 }

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

@@ -1,7 +1,11 @@
 package kcc.kccadr.adjReqMgrPast.service.impl;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -16,11 +20,14 @@ import org.springframework.stereotype.Service;
 import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
 import egovframework.rte.fdl.cmmn.exception.FdlException;
 import egovframework.rte.fdl.idgnr.EgovIdGnrService;
+import kcc.com.cmm.util.StringUtil;
 import kcc.com.utl.user.service.CheckAdrProcessUtil;
+import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO;
 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.service.HstryStatEnumVO;
 import kcc.kccadr.adjReqMgrPast.web.AdjReqMgrPastController;
 import kcc.kccadr.adjreqmgr.service.impl.AdjReqMgrDAO;
 import kcc.kccadr.adjst.service.impl.AdjstReqDAO;
@@ -82,7 +89,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
     @Resource(name = "adrHstryMgrDAO")
     private AdrHstryMgrDAO adrHstryMgrDAO;
 
-
 	//오프라인 조정신청 정보 상세내역 불러오기
 	public AdjReqMgrPastVO selectAdjReqMgrOffLineInfo(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{
 		
@@ -433,10 +439,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 		
 		int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn());
 		int cnt = 1;
-		System.out.println("adrSn :: " + adrSn);
 		while(cnt <= adrSn)
 		{
-			System.out.println("cnt : "+cnt);
 			adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService
 			adjReqMgrPastVO.setAdrSn(Integer.toString(cnt));
 			adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO);
@@ -704,8 +708,17 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 
 	@Override
 	public List<AdjReqMgrPastVO> findByAdrHstryId(AdjReqMgrPastVO adjPastVO) {
+		
 		List<AdjReqMgrPastVO> list = adjReqMgrPastDAO.findByAdrHstryId(adjPastVO);
-		list.forEach(t -> t.setHstryDe(t.getHstryDe().split(" ")[0]));
+		
+		for(AdjReqMgrPastVO adjReqVO :list)
+		{
+			if(StringUtils.isNotEmpty(adjReqVO.getHstryDe()))
+			{
+				adjReqVO.setHstryDe(adjReqVO.getHstryDe().split(" ")[0]);
+			}
+		}
+		
 		return list;
 	}
 
@@ -734,7 +747,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 			if("".equals(adjReqMgrPastVO.getAdrHstrySeq()))
 			{
 				adjReqMgrPastVO.setAdrHstrySeq(adrHstrySeqGnrService.getNextStringId());
-				adjReqMgrPastVO.setAdrSn("0");
+				adjReqMgrPastVO.setAdrSn("1");
 				adjReqMgrPastDAO.insertAdjReqRecordAjax(adjReqMgrPastVO);
 			}else{
 				adjReqMgrPastVO.setLastUpdusrId(adjPastVO.getLastUpdusrId());
@@ -743,6 +756,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 			
 		}
 		
+		adjReqMgrPastDAO.updateAdrEndDe(adjPastVO);
 		
 		
 		return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "사건진행정보 등록이 완료되었습니다.", LocalDateTime.now()));
@@ -799,18 +813,48 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 
 
 	@Override
-	public void updateAdjReqMgrEtc(AdjReqMgrPastVO adjReqMgrPastVO) throws FdlException {
+	public void updateAdjReqMgrEtc(AdjReqMgrOffLineVO adjReqMgrOffLineVO) throws FdlException {
+		
+
+		AdjReqMgrPastVO adjReqMgrPastVO = new AdjReqMgrPastVO();
+
+		adjReqMgrPastVO.setAdrSeq(adjReqMgrOffLineVO.getAdrSeq());
+		adjReqMgrPastVO.setMemDeptNm(adjReqMgrOffLineVO.getMemDeptNm()); // 조정부 PK
+		adjReqMgrPastVO.setMemPstSeq(adjReqMgrOffLineVO.getMemPstSeq()); // 조정부 명
+		adjReqMgrPastVO.setAssPstSeq(adjReqMgrOffLineVO.getAssPstSeq()); // 조사관 PK 
+		adjReqMgrPastVO.setAssPstUsrNm(adjReqMgrOffLineVO.getAssPstUsrNm()); // 조사관 명
+		adjReqMgrPastVO.setStatCd(adjReqMgrOffLineVO.getStatCd()); // 최종 결과 코드
+		adjReqMgrPastVO.setAdrHstrySeq(adjReqMgrOffLineVO.getAdrHstrySeq()); // 히스토리 PK
+		adjReqMgrPastVO.setAdrSn(adjReqMgrOffLineVO.getAdrSn()); // 차수
+		adjReqMgrPastVO.setPstCn(adjReqMgrOffLineVO.getPstCn()); // 조정결과
+		
+		adjReqMgrPastVO.setAdrNo(adjReqMgrOffLineVO.getAdrNo()); 
+		adjReqMgrPastVO.setFrstRegistPnttm(adjReqMgrOffLineVO.getFrstRegistPnttm());
+		adjReqMgrPastVO.setLastUpdtPnttm(adjReqMgrOffLineVO.getLastUpdtPnttm());
+		adjReqMgrPastVO.setAdrSnChgYn(adjReqMgrOffLineVO.getAdrSnChgYn());
+		
 		
 		logger.info(" ++ updateAdjReqMgrEtc ++ ");
+		
+		adjReqMgrPastDAO.updateBasicInfo(adjReqMgrPastVO);
+		
 		// 조정부 수정
 		adjReqMgrPastDAO.updateMemDeptNm(adjReqMgrPastVO);
 		
 		// 조사관 수정
 		adjReqMgrPastDAO.updateAssPstUsrNm(adjReqMgrPastVO);
 		
-		// 최종결과 CODE 수정
+		if(StringUtil.isNotEmpty(adjReqMgrPastVO.getAdrHstrySeq()))
-		adjReqMgrPastDAO.updateAdrHstry(adjReqMgrPastVO);
+		{
-		
+			// 최종결과 CODE 수정
+			adjReqMgrPastDAO.updateAdrHstry(adjReqMgrPastVO);
+		}
+		else
+		{
+			adjReqMgrPastVO.setAdrHstrySeq(adrHstrySeqGnrService.getNextStringId());
+			adjReqMgrPastVO.setAdrSn("0");
+			adjReqMgrPastDAO.insertAdjReqRecordAjax(adjReqMgrPastVO);
+		}
 		// 조정결과 수정
 		adjReqMgrPastDAO.updateAdrMgrDetailPstCn(adjReqMgrPastVO);
 		
@@ -821,44 +865,126 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 		 * 기존 차수와 현재 차수 갯수가 다르면 삭제 및 추가 해야함 
 		 * */
 		List<AdjReqMgrPastVO> prtclRowList = adjReqMgrPastDAO.selectAdrPrtclMgrRow(adjReqMgrPastVO);
-//		System.out.println("prtclRowList.get(0).getPrtclSeq() : "+ prtclRowList.get(0).getPrtclSeq()); 
-		prtclRowList.forEach(t->{
-			logger.info(" + t.getAdrSeq() [{}], [{}], [{}]", t.getAdrSeq(), t.getAdrSn(), t.getPrtclSeq());
-		});
-		logger.info(" exist row size :: [{}]", prtclRowList.size());
-		logger.info(" modify row size :: [{}]", adjReqMgrPastVO.getAdrSn());
-		int existAdrSnSize = prtclRowList.size();
-		int changeAdrSnSize = Integer.parseInt(adjReqMgrPastVO.getAdrSn()); 
 
-		// 기존에 있는 row보다 수정된 차수가 더 낮은 경우
+
-		// 기존row > 수정row
+		/* 
-		int gap = 0;
+		 * adjReqMgrPastVO.getAdrSnChgYn()
-		if(existAdrSnSize > changeAdrSnSize)
+		 * 차수 수정  
+		 * */
+		if("Y".equals(adjReqMgrPastVO.getAdrSnChgYn()))
 		{
-			gap = existAdrSnSize - changeAdrSnSize;
+				if(prtclRowList.size() > 0)
-			for(int i=existAdrSnSize; i > gap; i--)
+					adjReqMgrPastDAO.deleteAdrPrtclMgrRow(prtclRowList.get(0));
+			int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn());
+			int cnt = 1;
+			while(cnt <= adrSn)
 			{
-				adjReqMgrPastDAO.deleteAdrPrtclMgrRow(prtclRowList.get(i-1));
+				adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService
-			}
+				adjReqMgrPastVO.setAdrSn(Integer.toString(cnt));
-		}
+				adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO);
-		// 기존에 있는 row보다 수정된 차수가 더 높은 경우
-		// 기존row < 수정row
-		else if(existAdrSnSize < changeAdrSnSize) 
-		{
-			gap = changeAdrSnSize - existAdrSnSize;
-			
-			
-//			int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn());
-			int cnt = existAdrSnSize; // 기존 row size
-			while(cnt <= changeAdrSnSize) // 수정할 row size
-			{
-				System.out.println("cnt : "+cnt);
-//				adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService
-//				adjReqMgrPastVO.setAdrSn(Integer.toString(cnt));
-//				adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO);
 				cnt++;
 			}
 		}
+			
 	}
+
+
+	/* 
+	 *	ADR_RPPL - rppl_ty 값
+	 *	
+	 *	01 : 신청인
+	 *	02 : 피신청인
+	 *	03 : 신청대리인
+	 *	04 : 피신청인대리인
+     *
+	 */
+	@Override
+	public List<AdjReqMgrPastVO> selectAdjReqMgrPastList(AdjReqMgrPastVO adjReqMgrPastVO) {
+
+		// 
+		if(StringUtils.isNotEmpty(adjReqMgrPastVO.getSearchYear())
+				&& adjReqMgrPastVO.getSearchYear() != "99")
+			adjReqMgrPastVO.setDiffYear(this.setDiffYear(adjReqMgrPastVO.getSearchYear())); 
+		
+		
+		List<AdjReqMgrPastVO> adjReqMgrPastList = adjReqMgrPastDAO.selectAdjReqMgrPastList(adjReqMgrPastVO); 
+		
+		// 신청인 피신청인 select
+		adjReqMgrPastList.stream()
+						.forEach(t-> t.setAdjReqMgrVoList(adjReqMgrPastDAO.selectRpplList(t)));
+		/* 
+		 * 조정결과 상태값 select
+		 * code -> text 변환 
+		 * */
+		adjReqMgrPastList.stream()
+						.forEach(t-> {
+							if(StringUtils.isNotEmpty(t.getStatCd()))
+								t.setStatTx(HstryStatEnumVO.getStatCdSwitching(t.getStatCd()));
+						});
+
+		// 리스트에서 피신청인 갯수 count
+		adjReqMgrPastList.stream().forEach(t-> {
+			t.setpRpplCnt(t.getAdjReqMgrVoList().stream()
+					  .filter(c ->  "20".equals(c.getRpplTy()))
+					  .count());
+		});
+		
+		for(AdjReqMgrPastVO adjRpplVO : adjReqMgrPastList){
+			// 피신청 이름
+			String PrpplNm = "";
+			// 외 n명
+			String etcStr = "";
+			// 피신청인 1명 이름 추출
+			for(AdjReqMgrPastVO adjRppl : adjRpplVO.getAdjReqMgrVoList()) 
+			{
+				if("20".equals(adjRppl.getRpplTy()))
+				{
+					PrpplNm =  adjRppl.getRpplNm();
+					break;
+				}
+			}
+			// 신청인 이름 추출
+			for(AdjReqMgrPastVO adjRppl : adjRpplVO.getAdjReqMgrVoList()) 
+			{
+				if("10".equals(adjRppl.getRpplTy()))
+				{
+					adjRpplVO.setRpplNm(egovCryptoUtil.decrypt(adjRppl.getRpplNm()));
+					break;
+				}
+			}
+			// 피신청인이 1명보다 많으면 "외 n명" 구하기
+			if(adjRpplVO.getpRpplCnt() > 1) 
+			{
+				int cnt = (int) (adjRpplVO.getpRpplCnt()-1);
+				etcStr = " 외 "+cnt+"명";
+			}
+			adjRpplVO.setPrpplNm(egovCryptoUtil.decrypt(PrpplNm) + etcStr);
+		}
+		
+		
+		return adjReqMgrPastList;
+	}
+
+
+	@Override
+	public int selectAdjReqMgrPastListCount(AdjReqMgrPastVO adjReqMgrPastVO) {
+		if(StringUtils.isNotEmpty(adjReqMgrPastVO.getSearchYear())
+				&& adjReqMgrPastVO.getSearchYear() != "99")
+			adjReqMgrPastVO.setDiffYear(this.setDiffYear(adjReqMgrPastVO.getSearchYear())); 
+		return adjReqMgrPastDAO.selectAdjReqMgrPastListCount(adjReqMgrPastVO); 
+	}
+	
+	public String setDiffYear(String searchYear) {
+
+		int yearChar = Integer.parseInt(searchYear);
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(new Date());
+		DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        
+        cal.add(Calendar.YEAR, -yearChar);
+		
+		return df.format(cal.getTime());
+	}
+	
 }
 	

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

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 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;
@@ -149,6 +150,44 @@ public class AdjReqMgrPastController {
 		return "kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist";
 	}
 	
+	@RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastList.do")
+	public String adjReqMgrPastList(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception {
+		
+		if(adjReqMgrPastVO.getPageUnit() != 10) {
+			adjReqMgrPastVO.setPageUnit(adjReqMgrPastVO.getPageUnit());
+		}
+
+		if("".equals(adjReqMgrPastVO.getSearchSortOrd())){
+			adjReqMgrPastVO.setSearchSortOrd("desc");
+		}
+		if(("3".equals(adjReqMgrPastVO.getSearchCondition()) || "4".equals(adjReqMgrPastVO.getSearchCondition())) && StringUtils.isNotBlank(adjReqMgrPastVO.getSearchKeyword())){
+			adjReqMgrPastVO.setSearchKeyword(egovCryptoUtil.encrypt(adjReqMgrPastVO.getSearchKeyword()));
+		}
+
+		/** paging */
+		PaginationInfo paginationInfo = new PaginationInfo();
+		paginationInfo.setCurrentPageNo(adjReqMgrPastVO.getPageIndex());
+		paginationInfo.setRecordCountPerPage(adjReqMgrPastVO.getPageUnit());
+		paginationInfo.setPageSize(adjReqMgrPastVO.getPageSize());
+
+		adjReqMgrPastVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+		adjReqMgrPastVO.setLastIndex(paginationInfo.getLastRecordIndex());
+		adjReqMgrPastVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+		
+		adjReqMgrPastVO.setReqOlCd("2");
+		paginationInfo.setTotalRecordCount(adjReqMgrPastService.selectAdjReqMgrPastListCount(adjReqMgrPastVO));
+		model.addAttribute("paginationInfo", paginationInfo);
+		
+		// 과거사건 구분 코드
+		List<AdjReqMgrPastVO> list = adjReqMgrPastService.selectAdjReqMgrPastList(adjReqMgrPastVO);
+		// 복호화
+		model.addAttribute("list", list);
+
+		
+		
+		return "kccadr/adjReqMgrPast/adjReqMgrPastList";
+	}
+	
 	/** 
 	 * @methodName	: adjReqMgrPastProgRegist 
 	 * @author		: 이호영
@@ -309,8 +348,6 @@ public class AdjReqMgrPastController {
 	@RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastRecordRegist.do")
 	public String adjReqMgrPastRecordRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception {
 		
-		//TODO 테스트로 인한 seq 코딩
-		adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920");
 
 		List<AdjReqMgrPastVO> adrHstryList = adjReqMgrPastService.findByAdrHstryId(adjReqMgrPastVO);
 		
@@ -351,7 +388,6 @@ public class AdjReqMgrPastController {
 			return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now()));
 		}
 		
-		System.out.println("adjReqMgrPastVO :: "+ adjReqMgrPastVO.getAdrSeq());
 		//사용자 유니크 아이디 받아오기
 		adjReqMgrPastVO.setFrstRegisterId(userId);
 		adjReqMgrPastVO.setLastUpdusrId(userId);
@@ -548,30 +584,19 @@ public class AdjReqMgrPastController {
 		
 		//사용자 유니크 아이디 받아오기
 		adjReqMgrOffLineVO.setLastUpdusrId(userId);
-
 		/*
 		 * 오프라인 수정 로직 
 		 * 수정 X
 		 * */ 
 		String resultSts = adjReqMgrOffLineService.updateAdjReqMgrRpplReq(adjReqMgrOffLineVO);
 		
-		AdjReqMgrPastVO adjReqMgrPastVO = new AdjReqMgrPastVO();
-
-		adjReqMgrPastVO.setAdrSeq(adjReqMgrOffLineVO.getAdrSeq());
-		adjReqMgrPastVO.setMemDeptNm(adjReqMgrOffLineVO.getMemDeptNm()); // 조정부 PK
-		adjReqMgrPastVO.setMemPstSeq(adjReqMgrOffLineVO.getMemPstSeq()); // 조정부 명
-		adjReqMgrPastVO.setAssPstSeq(adjReqMgrOffLineVO.getAssPstSeq()); // 조사관 PK 
-		adjReqMgrPastVO.setAssPstUsrNm(adjReqMgrOffLineVO.getAssPstUsrNm()); // 조사관 명
-		adjReqMgrPastVO.setStatCd(adjReqMgrOffLineVO.getStatCd()); // 최종 결과 코드
-		adjReqMgrPastVO.setAdrHstrySeq(adjReqMgrOffLineVO.getAdrHstrySeq()); // 히스토리 PK
-		adjReqMgrPastVO.setAdrSn(adjReqMgrOffLineVO.getAdrSn()); // 차수
-		adjReqMgrPastVO.setPstCn(adjReqMgrOffLineVO.getPstCn()); // 조정결과
 		
 		/* 
 		 * 기존 수정로직 후 기타사항 수정
 		 * 조정부, 조정조사관, 진행된 차수, 최종결과, 조정결과
 		 * */
-		adjReqMgrPastService.updateAdjReqMgrEtc(adjReqMgrPastVO);
+			adjReqMgrPastService.updateAdjReqMgrEtc(adjReqMgrOffLineVO);
+			
 
 		if(resultSts.equals("updateSucc")) {
 			return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "정상적으로 수정하였습니다.", adjReqMgrOffLineVO.getAdrSeq(), LocalDateTime.now()));

src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java

@@ -229,6 +229,27 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{
 	private String amtInput = ""; // 입금금액
 	private String accTy = ""; // 납구계좌구분 10:저작위, 20:가상계좌
 	
+	//저작위 SMS문자발송
+	private String trId;			// 전자조정시스템 고유 ID
+	private String trPhone; 		// 수신자
+	private String sendTelNo; 		// 송신자
+	private String sendMsg; 		// 송신 메세지
+	private String emailSendResult;
+	private String smsTy;			// 문자 발송 문구 분류
+	/*
+	 * smsTy
+	 * 	000 - 관리자발송
+	 * 	001 - 보완요청
+	 * 	002 - 수수료납부요청
+	 * 	003 - 조정접수
+	 * 	004 - 기일통지서승인
+	 * 	005 - 기일조서 결재완료
+	 * 	006 - 조정조서 결재완료
+	 * 	007 - 직권조정결정서 확인완료
+	 * 	008 - 없음
+	 * 	009 - 조정불성립
+	 * 
+	 * */
 	
 	public AdjReqMgrVO getAdrVO() {
 		return adrVO;
@@ -1128,6 +1149,43 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{
 	public void setApprLastUpdusrId(String apprLastUpdusrId) {
 		this.apprLastUpdusrId = apprLastUpdusrId;
 	}
+	public String getTrId() {
+		return trId;
+	}
+	public void setTrId(String trId) {
+		this.trId = trId;
+	}
+	public String getTrPhone() {
+		return trPhone;
+	}
+	public void setTrPhone(String trPhone) {
+		this.trPhone = trPhone;
+	}
+	public String getSendTelNo() {
+		return sendTelNo;
+	}
+	public void setSendTelNo(String sendTelNo) {
+		this.sendTelNo = sendTelNo;
+	}
+	public String getSendMsg() {
+		return sendMsg;
+	}
+	public void setSendMsg(String sendMsg) {
+		this.sendMsg = sendMsg;
+	}
+	public String getSmsTy() {
+		return smsTy;
+	}
+	public void setSmsTy(String smsTy) {
+		this.smsTy = smsTy;
+	}
+	public String getEmailSendResult() {
+		return emailSendResult;
+	}
+	public void setEmailSendResult(String emailSendResult) {
+		this.emailSendResult = emailSendResult;
+	}
+	
 	
 	
 	

src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrDAO.java

@@ -148,4 +148,14 @@ public class AdjReqMgrDAO  extends EgovAbstractDAO {
     	update("adjReqMgrDAO.updateAdrMgrMasterDetailApprCn", adjReqMgrVO);
     }
     
+ // 조정알림SMS - SMS전송 요청 LOG 등록
+ 	public int insertAdrSmsCustomSend(AdjReqMgrVO adjReqMgrVO) throws Exception{
+ 		return update("AdjReqMgrDAO.insertAdrSmsCustomSend", adjReqMgrVO);
+ 	}
+ 	
+ 	// 조정알림SMS - MMS전송 요청 LOG 등록
+ 	public int insertAdrMmsCustomSend(AdjReqMgrVO adjReqMgrVO) throws Exception{
+ 		return update("AdjReqMgrDAO.insertAdrMmsCustomSend", adjReqMgrVO);
+ 	}
+    
 }

src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleDAO.java

@@ -8,6 +8,7 @@ import com.ibatis.sqlmap.client.SqlMapClient;
 
 import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
 import egovframework.rte.psl.dataaccess.util.EgovMap;
+import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO;
 
 /**
  * 저작위 SMS서버를 사용하기 위한 데이터 접근 클래스
@@ -54,4 +55,14 @@ public class SMSOracleDAO extends EgovAbstractDAO {
     	insert("SMSOracleDAO.insertSmsSendTest");
     }
     
+    // SMS 작성 메세지 전송 등록
+ 	public void insertSmsCustomSend(AdjReqMgrVO adjReqMgrVO) throws Exception{
+ 		insert("SMSOracleDAO.insertSmsCustomSend", adjReqMgrVO);
+ 	}
+ 	
+ 	// MMS 작성 메세지 전송 등록
+ 	public void insertMmsCustomSend(AdjReqMgrVO adjReqMgrVO) throws Exception{
+ 		insert("SMSOracleDAO.insertMmsCustomSend", adjReqMgrVO);
+ 	}
+
 }

src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java

@@ -613,59 +613,54 @@ public class SMSOracleServiceImpl  extends EgovAbstractServiceImpl implements SM
     	
     }
     
- // SMS 전송(저작위 SMS서버 DB등록)
+ // SMS 작성 메세지 전송(저작위 SMS서버 DB등록)
     @Override
     public String insertSmsCustomSend(AdjReqMgrVO adjReqMgrVO) throws Exception {
     	String result = "fail";
-    	List<EgovMap> sendMapList = getSmsSendMsg(adjReqMgrVO); // 전송 메세지 > 전자조정DB
+//    	List<EgovMap> sendMapList = getSmsSendMsg(adjReqMgrVO); // 전송 메세지 > 전자조정DB
-    	
-    	if (sendMapList == null || sendMapList.isEmpty()) {
-    		return result;
-    	}
     	
     	try {
-    		for (EgovMap map : sendMapList) {
 		
-    			// test 수신자 번호 여현준
+			/*
-    			//map.put("rpplPhone", "010-8532-6650");
+			 * 1. adjReqMgrVO로 수신자(trPhone), 메시지(sendMsg), 사건번호(adrNo)를 파라미터로 받는다.
-    			// test
+			 * 2. 정해진 송신자, 시스템 구분자는 미리 정의된 globals.properties 에서 받는다.
+			 * 3. 저작위 SMS 발송 DB로 insert
+			 * 4. 발송 이력을 남긴다.
+			 * 
+			 *  */
 			
-    			map.put("sendTelNo", sendTelNo); // 송신자 번호
+			adjReqMgrVO.setTrId(trId); // 시스템 구분자
-    			map.put("trId", trId); // 시스템 구분자
+			adjReqMgrVO.setSendTelNo(sendTelNo); // 송신자 번호
+			adjReqMgrVO.setSmsTy("000"); //문자 발송 문구 분류
+			/*
+			 * smsTy
+			 * 	000 - 관리자발송
+			 * 	001 - 보완요청
+			 * 	002 - 수수료납부요청
+			 * 	003 - 조정접수
+			 * 	004 - 기일통지서승인
+			 * 	005 - 기일조서 결재완료
+			 * 	006 - 조정조서 결재완료
+			 * 	007 - 직권조정결정서 확인완료
+			 * 	008 - 없음
+			 * 	009 - 조정불성립
+			 * 
+			 * */
 			
-    			String sendMsg = (String) map.get("sendMsg");
+			int bytes = adjReqMgrVO.getSendMsg().getBytes("euc-kr").length; // 발송메시지 바이트수
-    			int bytes = sendMsg.getBytes("euc-kr").length;
 			
-    			String rpplPhone = (String) map.get("rpplPhone");
+			if (bytes > 90) {
-    			String rpplEmail = (String) map.get("rpplEmail");
+//				sMSOracleDAO.insertMmsCustomSend(adjReqMgrVO); // SMS 등록 장문 > SMS DB(오라클)
-    			String rpplSmsYn = (String) map.get("rpplSmsYn");
+				adjReqMgrDAO.insertAdrMmsCustomSend(adjReqMgrVO); // SMS 이력 등록 장문 > 전자조정
-    			String rpplEmailYn = (String) map.get("rpplEmailYn");
+			} else {
+//				sMSOracleDAO.insertSmsCustomSend(adjReqMgrVO); // SMS 등록 단문 > SMS DB(오라클)
+				adjReqMgrDAO.insertAdrSmsCustomSend(adjReqMgrVO); // SMS 이력 등록 단문 > 전자조정
+			}
+			//sms 발송 관리 테이블에 저장
+			adjReqMgrVO.setRpplNm("");
+			msgMgrDAO.insertAdrSmsCustomLog(adjReqMgrVO); // SMS 이력 등록 단문 > 전자조정
 			
-    			String emailResult = "N";
+			result = "SUCCESS";
-    			if (rpplEmailYn != null && rpplEmailYn.equals("Y") && StringUtil2.isNotEmpty(rpplEmail)) { // 메일 수신여부
-//    				emailResult = insertEmailSend(map);
-    			}
-    			
-    			map.put("emailSendResult", emailResult);
-    			
-    			if (rpplSmsYn != null && rpplSmsYn.equals("Y") && StringUtil2.isNotEmpty(rpplPhone)) { // 문자 수신여부
-    				if (bytes > 90) {
-    					sMSOracleDAO.insertMmsSend(map); // SMS 등록 장문 > SMS DB(오라클)
-    					adjReqMgrDAO.insertAdrMmsSend(map); // SMS 이력 등록 장문 > 전자조정
-    				} else {
-    					sMSOracleDAO.insertSmsSend(map); // SMS 등록 단문 > SMS DB(오라클)
-    					adjReqMgrDAO.insertAdrSmsSend(map); // SMS 이력 등록 단문 > 전자조정
-    				}
-    				//sms 발송 관리 테이블에 저장
-    				msgMgrDAO.insertAdrSmsLog(map); // SMS 이력 등록 단문 > 전자조정
-    			} else { // 메일만 보낼시 단문테이블에라도 이력 등록
-    				adjReqMgrDAO.insertAdrSmsSend(map); // SMS 이력 등록 단문 > 전자조정
-    				//sms 발송 관리 테이블에 저장
-    				msgMgrDAO.insertAdrSmsLog(map); // SMS 이력 등록 단문 > 전자조정
-    			}
-    			
-    			result = "succ";
-    		}
     	} catch (Exception e) {
     		System.out.println("Exception Occured!!!");
 		}

src/main/java/kcc/kccadr/kccadrCom/web/KccadrCommonController.java

@@ -225,16 +225,19 @@ public class KccadrCommonController {
 	@RequestMapping("/web/kccadr/kccadrCom/postCheckLink.do")
 	public String postCheckLink(@RequestParam HashMap<String, String> paramMap) throws Exception {
 		
+		String sid = "";
+		
 		//파라미터 체크
 		if(paramMap.isEmpty()) {
 			return "redirect:/web/main/mainPage.do";
 		}else {
-			if(paramMap.containsKey("dnggi")) {
+			if(paramMap.containsKey("sid")) {
-				
+				sid = paramMap.get("sid").toString().trim(); 
 			}
 		}
 		
-		String resultUrl = "https://service.epost.go.kr/trace.RetrieveDomRigiTraceList.comm?sid1=6401780018896";
+		/*String resultUrl = "https://service.epost.go.kr/trace.RetrieveDomRigiTraceList.comm?sid1=" + sid;*/
+		String resultUrl = "https://service.epost.go.kr/trace.RetrieveDomRigiTraceList.comm?sid1=" + "6401780018896";
 //		https://service.epost.go.kr/trace.RetrieveDomRigiTraceList.comm?sid1=6401780018896
 		return "redirect:" + resultUrl;
 	}

src/main/java/kcc/kccadr/msg/service/impl/MsgMgrDAO.java

@@ -6,6 +6,7 @@ import org.springframework.stereotype.Repository;
 
 import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
 import egovframework.rte.psl.dataaccess.util.EgovMap;
+import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO;
 import kcc.kccadr.msg.service.MsgMgrVO;
 import kcc.kccadr.msg.service.SmsMgrVO;
 
@@ -68,4 +69,9 @@ public class MsgMgrDAO extends EgovAbstractDAO {
 		
 		insert("MsgMgrDAO.insertAdrSmsLog", egovMap);
 	}
+	
+	public void insertAdrSmsCustomLog(AdjReqMgrVO adjReqMgrVO) throws Exception{
+		
+		insert("MsgMgrDAO.insertAdrSmsCustomLog", adjReqMgrVO);
+	}
 }

src/main/resources/egovframework/sqlmap/com/sms/kccadr/SMS_SQL_Oracle.xml

@@ -2,6 +2,7 @@
 <!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
 <sqlMap>
 	<typeAlias  alias="egovMap" type="egovframework.rte.psl.dataaccess.util.EgovMap"/>
+	<typeAlias  alias="AdjReqMgrVO" type="kcc.kccadr.adjreqmgr.service.AdjReqMgrVO"/>
 
 	<select id="SMSOracleDAO.selectOracleTest" resultClass="int">
 		SELECT 1 FROM DUAL
@@ -109,4 +110,52 @@
 		)
 	</insert>
 	
+	<!-- SMS 작성 메세지 전송 -->
+	<insert id="SMSOracleDAO.insertSmsCustomSend" parameterClass="AdjReqMgrVO">
+		INSERT INTO SC_TRAN (
+			TR_NUM
+			,TR_SENDDATE
+			,TR_ID
+			/*,TR_SENDSTAT*/
+			/*,TR_MSGTYPE*/
+			,TR_PHONE
+			,TR_CALLBACK
+			,TR_MSG
+		) VALUES (
+			SC_TRAN_SEQ.NEXTVAL
+			,SYSDATE
+			,#trId#
+			/*,'0'*/
+			/*,'0'*/
+			,replace(#trPhone#, '-', '')
+			,#sendTelNo#
+			,#sendMsg#
+		)
+	</insert>
+	
+	<!-- MMS 작성 메세지 전송 -->
+	<insert id="SMSOracleDAO.insertMmsCustomSend" parameterClass="AdjReqMgrVO">
+		INSERT INTO MMS_MSG (
+			MSGKEY
+			,ID
+			,SUBJECT
+			,PHONE
+			,CALLBACK
+			,STATUS
+			,REQDATE
+			,MSG
+			,TYPE
+		) VALUES (
+			MMS_MSG_SEQ.NEXTVAL
+			,#trId#
+			,'[한국저작권위원회]'
+			,replace(#trPhone#, '-', '')
+			,#sendTelNo#
+			,'0'
+			,SYSDATE
+			,#sendMsg#
+			,'0'
+		)
+	</insert>
+	
 </sqlMap>            

src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml

@@ -902,5 +902,57 @@
 	
 	</update>
 	
+	<!-- SMS 작성 메세지 전송  요청 LOG 등록 -->
+	<update id="AdjReqMgrDAO.insertAdrSmsCustomSend" parameterClass="AdjReqMgrVO">
+		INSERT INTO ADR_SC_TRAN (
+			TR_NUM
+			,TR_SENDDATE
+			,TR_ID
+			/*,TR_SENDSTAT*/
+			/*,TR_MSGTYPE*/
+			,TR_PHONE
+			,TR_CALLBACK
+			,TR_MSG
+			,EMAIL_SEND_RESULT
+		) VALUES (
+			(SELECT IFNULL(MAX(TR_NUM), 0) + 1 FROM ADR_SC_TRAN)
+			,SYSDATE
+			,#trId#
+			/*,'0'*/
+			/*,'0'*/
+			,IFNULL(#trPhone#, '-')
+			,IFNULL(#sendTelNo#, '-')
+			,#sendMsg#
+			,#emailSendResult#
+		)
+	</update>
+	
+	<!-- MMS 작성 메세지 전송 요청 LOG 등록 -->
+	<update id="AdjReqMgrDAO.insertAdrMmsCustomSend" parameterClass="AdjReqMgrVO">
+		INSERT INTO ADR_MMS_MSG (
+			MSGKEY
+			,ID
+			,SUBJECT
+			,PHONE
+			,CALLBACK
+			,STATUS
+			,REQDATE
+			,MSG
+			,TYPE
+			,EMAIL_SEND_RESULT
+		) VALUES (
+			(SELECT IFNULL(MAX(MSGKEY), 0) + 1 FROM ADR_MMS_MSG)
+			,#trId#
+			,'[한국저작권위원회]'
+			,#trPhone#
+			,#sendTelNo#
+			,'0'
+			,SYSDATE
+			,#sendMsg#
+			,'0'
+			,#emailSendResult#
+		)
+	</update>
+	
 
 </sqlMap>

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

@@ -587,6 +587,7 @@
 			ADR_HSTRY
 		WHERE
 			ADR_SEQ = #adrSeq#
+		AND ADR_SN = 1
 		
 	</select>
 	
@@ -748,7 +749,15 @@
 			ADR_SEQ = #adrSeq#
 	</update>
 	
-	<select id="adjReqMgrPastDAO.selectAdrPrtclMgrRow" parameterClass="AdjReqPastVO"  resultClass="AdjReqPastVO">
+	<update id="adjReqMgrPastDAO.updateAdrEndDe" parameterClass="AdjReqPastVO">
+	
+		UPDATE ADR_MGR_MASTER SET
+			 ADR_END_DE = NOW()
+		WHERE 
+			ADR_SEQ = #adrSeq#
+	</update>
+	
+	<select id="adjReqMgrPastDAO.selectAdrPrtclMgrRow" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
 	
 		SELECT
 			ADR_SEQ as adrSeq
@@ -763,7 +772,213 @@
 	<delete id="adjReqMgrPastDAO.deleteAdrPrtclMgrRow" parameterClass="AdjReqPastVO">
 			DELETE FROM ADR_PRTCL_MGR              
 			WHERE ADR_SEQ = #adrSeq#
-			AND PRTCL_SEQ = #prtclSeq#
+<!-- 			AND PRTCL_SEQ = #prtclSeq# -->
 	</delete>
 	
+	<update id="adjReqMgrPastDAO.updateBasicInfo" parameterClass="AdjReqPastVO">
+	
+		UPDATE ADR_MGR_MASTER SET
+			ADR_NO = #adrNo#
+			, FRST_REGIST_PNTTM = TO_CHAR(#frstRegistPnttm#,'YYYY-MM-DD')	
+			, LAST_UPDT_PNTTM = #lastUpdtPnttm#
+		WHERE 
+			ADR_SEQ = #adrSeq#
+	</update>
+	
+	<select id="adjReqMgrPastDAO.selectAdjReqMgrPastList" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
+	<!-- 과거사건등록 select list  -->
+     
+		SELECT 
+			amm.ADR_SEQ		as adrSeq  				<!-- 사건 Pk  -->
+			, amm.ADR_NO	as adrNo				<!-- 조정번호  -->
+			, amm.CC_TY		as ccTy					<!-- 저작물 타입  -->
+			, amd.PST_CN	as pstCn   				<!-- 조정결과  -->
+			, aamp.ASS_PST_USR_NM	as assPstUsrNm  <!-- 조사관 이름  -->
+			, amdm.MEM_DEPT_NM		as memDeptNm	<!-- 조정부 명  -->
+			, amm.ADR_END_DE		as adrEndDe		<!-- 종료 일시 / 종료, 작성중 구분 -->
+			, ah.STAT_CD 			as statCd		<!-- 조정상태 상태값 -->
+		FROM
+			ADR_MGR_MASTER amm   
+		LEFT JOIN ADR_MGR_DETAIL amd
+			ON amm.ADR_SEQ = amd.ADR_SEQ 
+		LEFT JOIN ADR_ASS_MGR_PST aamp
+			ON amd.ADR_ADM_ID = aamp.ASS_PST_SEQ
+		LEFT JOIN ADR_MEM_DEPT_MGR_PST amdm
+			ON amd.MEM_DEPT_SEQ = amdm.MEM_PST_SEQ
+ 		LEFT JOIN ADR_HSTRY ah 
+			ON amm.ADR_SEQ  = ah.ADR_SEQ 
+			AND ah.stat_cd IS NOT null
+		WHERE 
+			amm.REQ_OL_CD = #reqOlCd#
+			
+		/*작성중*/
+		<isEqual property="searchCondition" prepend="AND" compareValue="10">
+			amm.ADR_END_DE IS NULL
+		</isEqual>
+		
+		/*작성완료*/
+		<isEqual property="searchCondition" prepend="AND" compareValue="20">
+			amm.ADR_END_DE IS NOT NULL
+		</isEqual>
+		
+		/*검색 조정번호:10, 조정조사관:20, 조정부:30 */
+		<isEqual property="searchCondition2" prepend="AND" compareValue="10">
+			amm.ADR_NO LIKE CONCAT('%' , #searchKeyword#, '%')
+		</isEqual>
+		<isEqual property="searchCondition2" prepend="AND" compareValue="20">
+			aamp.ASS_PST_USR_NM LIKE CONCAT('%' , #searchKeyword#, '%')
+		</isEqual>
+		<isEqual property="searchCondition2" prepend="AND" compareValue="30">
+			amdm.MEM_DEPT_NM LIKE CONCAT('%' , #searchKeyword#, '%')
+		</isEqual>
+		
+		/*조정상태*/
+		<isNotEmpty property="searchStatCdList">
+			<iterate open="(" close=")" conjunction=","  property="searchStatCdList" prepend="AND ah.STAT_CD IN " >  #searchStatCdList[]#</iterate>
+		</isNotEmpty>
+			
+
+		
+		/*날짜 검색 - 기간지정*/
+		<isEqual property="searchYear" compareValue="99">
+			<isNotEmpty prepend="AND" property="searchStartDt">
+				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchStartDt#, '-' , '')
+			</isNotEmpty>
+	
+			<isNotEmpty prepend="AND" property="searchEndDt">
+				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD')<![CDATA[ <= ]]> REPLACE(#searchEndDt#, '-' , '')
+			</isNotEmpty>
+		</isEqual>
+		/*날짜 검색 - 1년 전까지*/
+		<isEqual property="searchYear" compareValue="1">
+			<isNotEmpty prepend="AND" property="searchStartDt">
+				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffYear#, '-' , '')
+			</isNotEmpty>
+		</isEqual>
+		/*날짜 검색 - 3년 전까지*/
+		<isEqual property="searchYear" compareValue="3">
+			<isNotEmpty prepend="AND" property="searchStartDt">
+				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffYear#, '-' , '')
+			</isNotEmpty>
+		</isEqual>
+		/*날짜 검색 - 6년 전까지*/
+		<isEqual property="searchYear" compareValue="6">
+			<isNotEmpty prepend="AND" property="searchStartDt">
+				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffYear#, '-' , '')
+			</isNotEmpty>
+		</isEqual>
+	
+		
+		ORDER BY amm.adr_seq
+		<isNotEmpty property="searchSortOrd">
+		 	$searchSortOrd$ 
+		</isNotEmpty>
+		LIMIT #recordCountPerPage# OFFSET #firstIndex#
+	</select>
+	
+	
+	<select id="adjReqMgrPastDAO.selectAdjReqMgrPastListCount" parameterClass="AdjReqPastVO" resultClass="Integer">
+		SELECT
+		 	COUNT(1) AS TOT
+		FROM
+			ADR_MGR_MASTER amm   
+		LEFT JOIN ADR_MGR_DETAIL amd
+			ON amm.ADR_SEQ = amd.ADR_SEQ 
+		LEFT JOIN ADR_ASS_MGR_PST aamp
+			ON amd.ADR_ADM_ID = aamp.ASS_PST_SEQ
+		LEFT JOIN ADR_MEM_DEPT_MGR_PST amdm
+			ON amd.MEM_DEPT_SEQ = amdm.MEM_PST_SEQ
+ 		LEFT JOIN ADR_HSTRY ah 
+			ON amm.ADR_SEQ  = ah.ADR_SEQ 
+			AND ah.stat_cd IS NOT null
+		WHERE 
+			amm.REQ_OL_CD = #reqOlCd#
+			
+		/*작성중*/
+		<isEqual property="searchCondition" prepend="AND" compareValue="10">
+			amm.ADR_END_DE IS NULL
+		</isEqual>
+		
+		/*작성완료*/
+		<isEqual property="searchCondition" prepend="AND" compareValue="20">
+			amm.ADR_END_DE IS NOT NULL
+		</isEqual>
+		
+		/*검색 조정번호:10, 조정조사관:20, 조정부:30 */
+		<isEqual property="searchCondition2" prepend="AND" compareValue="10">
+			amm.ADR_NO LIKE CONCAT('%' , #searchKeyword#, '%')
+		</isEqual>
+		<isEqual property="searchCondition2" prepend="AND" compareValue="20">
+			aamp.ASS_PST_USR_NM LIKE CONCAT('%' , #searchKeyword#, '%')
+		</isEqual> 
+		<isEqual property="searchCondition2" prepend="AND" compareValue="30">
+			amdm.MEM_DEPT_NM LIKE CONCAT('%' , #searchKeyword#, '%')
+		</isEqual>
+		
+
+		/*날짜 검색 - 기간지정*/
+		<isEqual property="searchYear" compareValue="99">
+			<isNotEmpty prepend="AND" property="searchStartDt">
+				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchStartDt#, '-' , '')
+			</isNotEmpty>
+	
+			<isNotEmpty prepend="AND" property="searchEndDt">
+				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD')<![CDATA[ <= ]]> REPLACE(#searchEndDt#, '-' , '')
+			</isNotEmpty>
+		</isEqual>
+		/*날짜 검색 - 1년 전까지*/
+		<isEqual property="searchYear" compareValue="1">
+			<isNotEmpty prepend="AND" property="searchStartDt">
+				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffYear#, '-' , '')
+			</isNotEmpty>
+		</isEqual>
+		/*날짜 검색 - 3년 전까지*/
+		<isEqual property="searchYear" compareValue="3">
+			<isNotEmpty prepend="AND" property="searchStartDt">
+				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffYear#, '-' , '')
+			</isNotEmpty>
+		</isEqual>
+		/*날짜 검색 - 6년 전까지*/
+		<isEqual property="searchYear" compareValue="6">
+			<isNotEmpty prepend="AND" property="searchStartDt">
+				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffYear#, '-' , '')
+			</isNotEmpty>
+		</isEqual>
+	
+		
+		/*조정상태*/
+		<isNotEmpty property="searchStatCdList">
+			<iterate open="(" close=")" conjunction=","  property="searchStatCdList" prepend="AND ah.STAT_CD IN " >  #searchStatCdList[]#</iterate>
+		</isNotEmpty>
+	</select>
+	
+	<select id="adjReqMgrPastDAO.selectRpplList" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
+	<!-- 과거사건등록 rppl select list  -->
+     
+		SELECT
+			RPPL_TY as rpplTy
+			, RPPL_NM as rpplNm
+		FROM 
+			ADR_RPPL
+		WHERE 
+			ADR_SEQ = #adrSeq#
+	</select>
+	
+	<select id="adjReqMgrPastDAO.findByIdAdrHstry" parameterClass="AdjReqPastVO" resultClass="String">
+	<!-- 과거사건등록 rppl select list  -->
+     
+		SELECT
+			STAT_CD
+		FROM 
+			ADR_HSTRY
+		WHERE 
+			ADR_SEQ = #adrSeq#
+		AND STAT_CD IS NOT NULL
+	</select>
+	
+	
+
+	
+	
+	
 </sqlMap>

src/main/resources/egovframework/sqlmap/kccadr/msg/Msg_SQL_Mysql.xml

@@ -4,6 +4,7 @@
 	<typeAlias  alias="egovMap" type="egovframework.rte.psl.dataaccess.util.EgovMap"/>
 	<typeAlias  alias="MsgMgrVO" type="kcc.kccadr.msg.service.MsgMgrVO"/>
 	<typeAlias  alias="SmsMgrVO" type="kcc.kccadr.msg.service.SmsMgrVO"/>
+	<typeAlias  alias="AdjReqMgrVO" type="kcc.kccadr.adjreqmgr.service.AdjReqMgrVO"/>
 	
 	<!-- 발송문구 갯수 -->
 	<select id="MsgMgrDAO.msgMgrListCount" parameterClass="MsgMgrVO" resultClass="Integer">
@@ -196,4 +197,31 @@
 		       
 	</insert>
 	
+	<insert id="MsgMgrDAO.insertAdrSmsCustomLog" parameterClass="AdjReqMgrVO">
+	
+		INSERT
+		INTO   ADR_SMS_LOG
+		       (
+		              SMS_CN,
+		              SMS_TY,
+		              SMS_TO,
+		              SMS_FROM,
+		              ADR_NO,
+		              SMS_SEND_PNTTM,
+		              REGIST_PNTTM
+		       )
+		       VALUES
+		       (
+		              #sendMsg#,
+		              #smsTy#,
+		              #rpplNm#,
+		              #trId#,
+		              #adrNo#,
+		              NOW(),
+		              NOW()
+		       )
+
+		       
+	</insert>
+	
 </sqlMap>

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt.jsp

@@ -19,6 +19,7 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
 <%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %>
+<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
 <!DOCTYPE html>
 <html>
 <head>
@@ -423,6 +424,16 @@ function authorChange(obj) {
 						            <form:hidden path="uniqId" />
 								</td>
 							</tr>
+							<tr>
+								<th><span class="reqArea">로그인 유형</span></th>
+								<td colspan="3">
+									<div class="radio_wrap">
+										<!-- <span><input type="radio" name="loginType" id="IP" class="radio2" value="IP"><label for="IP">IP제어</label></span>
+										<span><input type="radio" name="loginType" id="OTP" class="radio2" value="OTP"  checked><label for="OTP">OTP</label></span> -->
+										<kc:radio codeId="CC051" name="loginType" id="loginType" selectedValue="002" />
+									</div>
+								</td>
+							</tr>
 							<tr>
 								<th><span class="reqArea">이름</span></th>
 								<td colspan="3">

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp

@@ -309,12 +309,19 @@ $(document).ready(function(){
 		});
 	});
 	/*//워크플로우 */
+	
 	//조정사건메모
 	function fncAdrMemo() {
-
 		var pop = document.pop;
 		commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adrMemo.do", '820', '500', "adrMemoPop", $('#pop'));
 	}
+	
+	// 문자 발송 팝업
+	function fncSmsSend() {
+		var pop = document.pop;
+		commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/smsSendPop.do", '820', '500', "smsSendPop", $('#pop'));
+	}
+	
 </script>
 
 <!-- 워크플로우용 스크립트 시작 -->
@@ -936,6 +943,7 @@ $(document).ready(function(){
 				--%>
 				</div>
 				<div class="btn_right_box">
+					<button type="button" class="btnType03" onclick="fncSmsSend();">문자발송</button>
 					<button type="button" class="btnType03" onclick="fncGo('apm/apmList.do')">목록</button>
 				</div>
 			</div>

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/smsSendPop.jsp

@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%>
+<html lang="ko">
+<head>
+<title>사건메모</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<script type="text/javascript">
+	function fnSmsSend(){
+		var data = new FormData(document.smsForm);
+		
+		$.ajax({
+		    type: "POST",
+		    url: "/kccadr/adjPgrMgr/apm/smsSendAjax.do",
+		    data: data,
+		    dataType:'json',
+		    async: false,
+		    processData: false,
+		    contentType: false,
+		    cache: false,
+		    success: function (returnData, status) {
+			console.log(returnData.result);
+			if(returnData.result ==  'SUCCESS'){
+				alert("문자발송요청에 성공하였습니다.");
+				if(confirm("문자발송을 계속하시겠습니까?")){
+					
+				}else{
+					window.close()
+				}
+			}else{
+			    alert(returnData.message);                                        
+			}
+		    },
+		    error: function (e) { alert("요청에 실패하였습니다."); console.log("ERROR : ", e); }
+		});
+	}
+</script>
+</head>
+<body>
+	<form id="smsForm" name="smsForm" onsubmit="return false;" method="post">
+		<input type="hidden" name="adrSeq" id="adrSeq" value="<c:out value="${adjReqMgrVO.adrSeq}" />"  />
+		<input type="hidden" name="adrNo" id="adrNo" value="<c:out value="${adjReqMgrVO.adrNo}" />"  />
+	
+		<div class="area_popup supm_popup" style="width: 800px;">
+			<div class="cont_popup">
+				<p class="tb_tit">문자 발송</p>
+				<table class="pop_tbType01">
+					<colgroup>
+						<col style="width: 20%;">
+						<col style="width: auto;">
+					</colgroup>
+					<tbody>
+						<tr>
+							<th>전화번호</th>
+							<td>
+								<p><input type="text" name="trPhone" id="trPhone"/></p>
+							</td>
+						</tr>
+						<tr>
+							<th>내용</th>
+							<td>
+								<p><textarea rows="50" cols="30" name="sendMsg" id="sendMsg"></textarea></p>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+				<div class="btn_wrap btn_layout04">
+					<button type="button" class="btnType06" onclick="fnSmsSend();">발송</button>
+					<button type="button" class="btnType03" onclick="window.close()">닫기</button>
+				</div>
+			</div>
+		</div>
+	</form>
+</body>
+</html>

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp

@@ -619,7 +619,7 @@
 									<button type="button" class="btnType02" onclick="listDlvInfo();">송달정보조회</button>
 								</c:when>
 								<c:otherwise>
-									<c:if test="${info.statCd == KccadrConstants.ADR_APP_NTC_APPR}">
+									<c:if test="${info.statCd*1 >= KccadrConstants.ADR_APP_NTC_APPR*1}">
 										<button type="button" class="btnType02" onclick="sendDlvInfoPop();">송달정보입력</button>
 									</c:if>
 								</c:otherwise>

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrReg.jsp

@@ -431,8 +431,8 @@
                         
                         <!-- ${info.statCd} -->
                         	<!-- 조정조서완료(304050)또는 종결결재요청 이상(309010) 또는 종결(400000) 인 경우 승인요청, 삭제/수정  버튼 노출-->
-	                        <c:if test="${info.statCd eq '304050'
+	                        <c:if test="${info.statCd*1 ge 304050
-	                        ||	info.statCd*1 gt 309000
+	                        ||	info.statCd*1 ne 304090
 	                        }">
 	                            
 	                            <!-- 송달정보가 있으면 조회, 없으면 입력 버튼 노출-->

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entReg.jsp

@@ -257,8 +257,8 @@
                         
                         <!-- ${info.statCd} -->
                         	<!-- 조정취하완료(305050)또는 종결결재요청 이상(309010) 또는 종결(400000) 인 경우 승인요청, 삭제/수정  버튼 노출-->
-	                        <c:if test="${info.statCd eq '305050'
+	                        <c:if test="${info.statCd*1 ge 305050
-	                        ||	info.statCd*1 gt 309000
+	                        ||	info.statCd*1 ne 305090
 	                        }">
 	                            
 	                            <!-- 송달정보가 있으면 조회, 없으면 입력 버튼 노출-->

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp

@@ -548,7 +548,7 @@
                         <div class="area_left"></div>
                         <div class="area_right">
                         	<!-- 직권조정완료(306050)또는 종결결재요청 이상(309010) 또는 종결(400000) 인 경우 승인요청, 삭제/수정  버튼 노출-->
-	                        <c:if test="${info.statCd eq '306050' && info.statCd ne '306090'}">
+	                        <c:if test="${info.statCd ge '306050' && info.statCd ne '306090'}">
 	                            <button type="button" class="btnType06" onclick="fncPrint()">출력</button>
 	                            
 	                            <!-- 송달정보가 있으면 조회, 없으면 입력 버튼 노출-->

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

@@ -70,17 +70,32 @@ $(document).on('change', '#adrSnTemp', function(){
 		{
 			$('#adrSnTemp').val($('#prtclSize').val()).prop("selected", true); 
 			
+		}else{
+			$('#adrSnChgYn').val('Y');
 		}
 		
 	}
 });
 
 
+function fn_goListPage(){
+
+    var pageForm = document.pageForm ;
+    pageForm.action = "<c:url value='/kccadr/adjReqMgOff/adjReqMgrPastList.do'/>";
+    pageForm.submit();
+
+}
+
+
 
 </script>
 </head>
 <body>
 
+<form id="pageForm" name="pageForm" method="post">
+	<input type="hidden" name="pageIndex" id="pageIndex" value="1">
+</form>
+
 <form id="pop" name="pop" method="post">
 	<input type="hidden" name="ccTy" value="<c:out value='${adrVO.ccTy}'/>">
 	<input type="hidden" id="exmpCd" name="exmpCd" value="">
@@ -101,7 +116,8 @@ $(document).on('change', '#adrSnTemp', function(){
 	<input type="hidden" name="frstRegistPnttm" id="frstRegistPnttm" value="" />
 	<input type="hidden" name="lastUpdtPnttm" id="lastUpdtPnttm" value="" />
 	<input type="hidden" name="adrSn" id="adrSn" value="" />
-	<input type="hidden" name="limitcount" value="50" />>
+	<input type="hidden" name="adrSnChgYn" id="adrSnChgYn" value="N" />
+	<input type="hidden" name="limitcount" value="50" />
 
 <!-- cont -->
 <div class="cont_wrap">
@@ -131,15 +147,15 @@ $(document).on('change', '#adrSnTemp', function(){
 						<tr>
 							<th>조정번호</th>
 							<td>
-								<input type="text" name="adrNoTemp" id="adrNoTemp" value="2019조정0001" size="30"/>
+								<input type="text" name="adrNoTemp" id="adrNoTemp" value="${adrVO.adrNo }" size="30"/>
 							</td>
 						</tr>
 						<tr>
 							<th>조정신청일</th>
 							<td>
 								<div id="sel_date" class="sel_date">
-<%-- 									<input readonly="readonly" type="text" class="startDate inp" title="검색시작일" id="startDate01" name="searchStartDt" value="${adjReqMgrPastVO.frstRegistPnttm}" data-datecontrol="true"> --%>
+									<c:set var="frstPnttm" value="${fn:split(adrVO.frstRegistPnttm, ' ')[0]}" />
-									<input readonly="readonly" type="text" class="startDate inp" title="검색시작일" id="startDate01" name="searchStartDt" value="2022-08-02" data-datecontrol="true">
+									<input readonly="readonly" type="text" class="startDate inp" title="검색시작일" id="startDate01" name="searchStartDt" value="${frstPnttm }" data-datecontrol="true">
 									<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;">
@@ -153,7 +169,8 @@ $(document).on('change', '#adrSnTemp', function(){
 							<th>조정종결일</th>
 							<td>
 								<div id="sel_date" class="sel_date">
-									<input readonly="readonly" type="text" class="endDate inp" title="검색시작일" id="endDate" name="searchEndDt" value="2022-08-03" data-datecontrol="true">
+									<c:set var="lastPnttm" value="${fn:split(adrVO.lastUpdtPnttm, ' ')[0]}" />
+									<input readonly="readonly" type="text" class="endDate inp" title="검색시작일" id="endDate" name="searchEndDt" value="${lastPnttm }" data-datecontrol="true">
 									<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;">
@@ -333,76 +350,6 @@ $(document).on('change', '#adrSnTemp', function(){
 								</div>
 							</td>
 						</tr>
-						<%-- <tr>
-							<th>대리신청서</th>
-							<td class="upload_area_fr">
-								<!-- <input type="text" id="fileNm" size="30" class="file_input" readonly> --><!-- <button type="button" class="btnType01 btn_add_file">파일 첨부하기</button> -->
-								<input type="file" id="file_temp_fr" name="file_temp_fr" class="uploadFile" style="display:none"/>
-								<button type="button" id="filebutton_fr" class="btnType01 btn_add_file">파일 첨부하기</button>
-								<div class="file_wrap file_upload_box_fr no_img_box_fr">
-									<table>
-										<colgroup>
-											<col style="width: 60%;">
-											<col style="width: auto;">
-											<col style="width: 20%;">
-											<col style="width: 10%;">
-										</colgroup>
-										<thead>
-											<!-- <th>
-												<input type="checkbox" id="all_check"><label for="all_check"></label>
-											</th> -->
-											<th>파일 명</th>
-											<th>종류</th>
-											<th>크기</th>
-											<th>삭제</th>
-										</thead>
-										<tbody class="tb_file_before">
-											<tr>
-												<td colspan="4">
-													<p>첨부하실 파일을 <span>마우스로 끌어서</span> 넣어주세요.</p>
-												</td>
-											</tr>
-										</tbody>
-									</table>
-								</div>
-								<div class="file_wrap fileAfter_fr file_list_div_fr">
-									<table>
-										<colgroup>
-											<col style="width: 60%">
-											<col style="width: 10%">
-											<col style="width: 20%">
-											<col style="width: 10%">
-										</colgroup>
-										<thead>
-											<th>파일 명</th>
-											<th>종류</th>
-											<th>크기</th>
-											<th>삭제</th>
-										</thead>
-										<tbody id="tbody_fiielist_fr" class="tb_file_after">
-											<c:forEach var="fileList" items="${fileList}" varStatus="status">
-			                        			<tr class="item_${fileList.atchFileId}_${fileList.fileSn} uploaded_obj">
-													<input type="hidden" name="fileSize" class="item_file_size_fr" value="${fileList.fileSize}">
-													<td class="td_filename">
-														<!-- <img src="/direct/img/upload_hwp_img.png" alt="" /> -->
-														<span class="file_name_text">${fileList.orignlFileNm}</span>
-													</td>
-													<td class="td_filesort">
-														<span class="file_filesort_text" value="<c:out value="${fileList.fileExtsn}"/>"><c:out value="${fileList.fileExtsn}"/></span>
-													</td>
-													<td class="td_filesize">
-														<span class="file_size_text" value="<c:out value="${fileList.fileMg}"/>"><c:out value="${fileList.fileMg}"/></span>
-													</td>
-													<td>
-														<button type="button" class="btn_del" onclick="delAtchFile('${fileList.atchFileId}', '${fileList.fileSn}'); return false;"><i></i></button>
-													</td>
-												</tr>
-			                        		</c:forEach>
-										</tbody>
-									</table>
-								</div>
-							</td>
-						</tr> --%>
 					</tbody>
 				</table>
 			</div>
@@ -1453,6 +1400,7 @@ $(document).on('change', '#adrSnTemp', function(){
 				</div>
 				<div class="area_right">
 					<button type="button" class="btnType06" onclick="fn_adjReqMgr_insert(); return false;">다음단계 저장 ></button>
+					<button class="btnType04"  onclick="fn_goListPage(); return false;">목록</button>
 				</div>
 			</div>
 			<!-- //btn_wrap -->
@@ -1462,9 +1410,7 @@ $(document).on('change', '#adrSnTemp', function(){
 </div>
 </form:form>
 <form id="nextGoPageForm" action="<c:url value='/kccadr/adjReqMgOff/adjReqMgrPastProgRegist.do' />">
-<%-- 	<input type="hidden" id="adrSeqHidden" name="adrSeq" value="<c:out value="${adrVO.adrSeq }" />" /> --%>
+	<input type="hidden" id="adrSeqHidden" name="adrSeq" value="<c:out value="${adrVO.adrSeq }" />" />
-	<!-- 임시  -->
-	<input type="hidden" id="adrSeqHidden" name="adrSeq" value="ADR_0000000000003130" />
 </form>
 <!-- //cont -->
 </body>

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

@@ -50,6 +50,13 @@ function fn_testPageAlert(){
 	alert("사건관련 문서 추가 시 작동하는 버튼입니다. \n 첨부파일 솔루션 도입 후 적용 예정");
 }
 
+function fn_goListPage(){
+    var pageForm = document.pageForm ;
+    pageForm.action = "<c:url value='/kccadr/adjReqMgOff/adjReqMgrPastList.do'/>";
+    pageForm.submit();
+}
+
+
 </script>
 <style type="text/css">
 .calendarPop {left:-165px;}
@@ -65,6 +72,10 @@ function fn_testPageAlert(){
 </head>
 <body>
 
+<form id="pageForm" name="pageForm" method="post">
+	<input type="hidden" name="pageIndex" id="pageIndex" value="1">
+</form>
+
 <form id="popPageForm" name="popPageForm" method="post">
 <!-- 	<input type="hidden" id="prtclSeq" name="prtclSeq" value="" />  -->
 	<input type="hidden" id="adrSeq" name="adrSeq" value="<c:out value="${adjReqMgrPastVO.adrSeq}" />" />
@@ -240,6 +251,7 @@ function fn_testPageAlert(){
 					</div>
 					<div class="area_right">
 						<button type="button" id="goPage" class="btnType06">다음단계 이동 &gt;</button>
+						<button class="btnType04"  onclick="fn_goListPage(); return false;">목록</button>
 					</div>
 				</div>
 				<!-- //하단 버튼 -->

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

@@ -0,0 +1,277 @@
+<%@ 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"%>
+<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
+<!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(){
+	
+	
+	// 전체 클릭시 체크박스 모두 체크 / 해제 이벤트
+	$('#searchStatCdAll').on('click', function(){
+		
+		if ( $(this).prop('checked') ) {
+			$(this).parent().addClass("selected");
+			$('[id^="searchStatCd"]').prop("checked", true);    
+		} else {
+			$('[id^="searchStatCd"]').prop("checked", false);  
+		}
+	});
+	
+});
+
+function fncGoList(){
+    linkPage(1);
+}
+
+function linkPage(pageNo){
+    var listForm = document.listForm ;
+    listForm.pageIndex.value = pageNo ;
+    listForm.action = "<c:url value='/kccadr/adjReqMgOff/adjReqMgrPastList.do'/>";
+    listForm.submit();
+}
+
+function fn_Create(){
+	
+    var goForm = document.goForm;
+    goForm.adrSeq.value = "";
+    goForm.submit();
+}
+
+function fn_goDetail(adrSeq){
+	
+    var goForm = document.goForm;
+    goForm.adrSeq.value = adrSeq;
+    goForm.submit();
+}
+
+</script>
+</head>
+<body>
+	<form id="listForm" name="listForm" action="" method="post">
+		<input type="hidden" name="pageIndex" value="<c:out value='${adjReqMgrPastVO.pageIndex}' default='1' />"/>
+		<input type="hidden" name="searchSortOrd" value="<c:out value="${adjReqMgrPastVO.searchSortOrd }" />"/>
+		<div class="cont_wrap">
+			<div class="box">
+				<div class="cont_tit">
+					<h2>과거사건목록</h2>
+					<ul class="cont_nav">
+						<li class="home"><a href="/"><i></i></a></li>
+		<!-- 				<li> -->
+		<!-- 					<p>xxx</p> -->
+		<!-- 				</li> -->
+						<li><span class="cur_nav">과거사건 기록 목록</span></li>
+					</ul>
+				</div>
+<!-- 				<div class="cont inte_cont"> -->
+				<div class="cont">
+				
+				
+				
+                    <div class="list_top">
+                        <%--<p>총 건수 : <span><c:out value="${paginationInfo.totalRecordCount}"/></span>건</p>--%>
+                        <!-- <p>총 건수 : <span>204</span>건</p> -->
+                        <div class="list_util">
+<!--                             <div class="btn_wrap right"> -->
+<!--                                 <button type="button" class="btn_down_excel" onclick="fncExcel(); return false;">엑셀 다운로드</button> -->
+<!--                             </div> -->
+                            <div class="detail_search">
+                                <ul>
+                                    <li>
+                                        <p class="tit_text">구분</p>
+                                        <select name="searchCondition2" id="searchCondition2" title="선택">
+                                            <option value="">선택</option>
+                                            <option value="10" <c:if test="${adjReqMgrPastVO.searchCondition2 == '10'}">selected</c:if>>조정번호</option>
+                                            <option value="20" <c:if test="${adjReqMgrPastVO.searchCondition2 == '20'}">selected</c:if>>조정조사관</option>
+                                            <option value="30" <c:if test="${adjReqMgrPastVO.searchCondition2 == '30'}">selected</c:if>>조정부</option>
+                                        </select>
+                                        <input type="text" class="search_input" id="searchKeyword" name="searchKeyword" value="<c:out value='${adjReqMgrPastVO.searchKeyword}'/>" placeholder="검색어를 입력하세요.">
+                                        <button class="btnType07 btn_search" onclick="fncGoList()">검색</button>
+                                    </li>
+                                    <li>
+                                        <p class="tit_text">조정상태</p>
+                                        <div class="check_wrap">
+                                            <span>
+                                                <input type="checkbox" id="searchStatCdAll" name="searchStatCdAll" value="Y">
+                                                <label for="searchStatCdAll">전체</label>
+                                            </span>
+                                            <span>
+                                                <input type="checkbox" id="searchStatCd1" name="searchStatCdList" value="305050" <c:if test="${fn:indexOf(adjReqMgrPastVO.searchStatCdList,'305050') > -1 }"> checked </c:if>>
+                                                <label for="searchStatCd1">조정취하</label>
+                                            </span>
+                                            <span>
+                                                <input type="checkbox" id="searchStatCd2" name="searchStatCdList" value="304050" <c:if test="${fn:indexOf(adjReqMgrPastVO.searchStatCdList,'304050') > -1 }"> checked </c:if>>
+                                                <label for="searchStatCd2">조정조서종결(성립)</label>
+                                            </span>
+                                            <span>
+                                                <input type="checkbox" id="searchStatCd3" name="searchStatCdList" value="307050" <c:if test="${fn:indexOf(adjReqMgrPastVO.searchStatCdList,'307050') > -1 }"> checked </c:if>>
+                                                <label for="searchStatCd3">불성립종결(불성립 / 조정권고 불성립 / 직권조정 불성립)</label>
+                                            </span>
+                                            <span>
+                                                <input type="checkbox" id="searchStatCd4" name="searchStatCdList" value="306050" <c:if test="${fn:indexOf(adjReqMgrPastVO.searchStatCdList,'306050') > -1 }"> checked </c:if>>
+                                                <label for="searchStatCd4">직권조정성립</label>
+                                            </span>
+                                        </div>
+                                    </li>
+                                    <li>
+                                        <p class="tit_text">신청일자</p>
+                                        <div class="radio_wrap">
+                                            <span>
+                                                <input ${adjReqMgrPastVO.searchYear eq '1' ? 'checked' : ''} value="1" type="radio" name="searchYear" id="year1">
+                                                <label for="year1">1년</label>
+                                            </span>
+                                            <span>
+                                                <input ${adjReqMgrPastVO.searchYear eq '3' ? 'checked' : ''} value="3" type="radio" name="searchYear" id="year3">
+                                                <label for="year3">3년</label>
+                                            </span>
+                                            <span>
+                                                <input ${adjReqMgrPastVO.searchYear eq '6' ? 'checked' : ''} value="6" type="radio" name="searchYear" id="year6">
+                                                <label for="year6">6년</label>
+                                            </span>
+                                            <span>
+                                                <input ${adjReqMgrPastVO.searchYear eq '99' ? 'checked' : ''} value="99" type="radio" name="searchYear" id="yearEtc">
+                                                <label for="yearEtc">기간지정</label>
+                                            </span>
+			                            	<div id="sel_date" class="sel_date">
+					                           	<div class="calendar_wrap">
+													<input type="text" class="startDate inp" title="검색시작일" id="startDate01" name="searchStartDt" value="${adjReqMgrPastVO.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="${adjReqMgrPastVO.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>
+                                        </div>
+                                    </li>
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+					<div class="list_top">
+						<p>총 <span> <c:out value="${paginationInfo.totalRecordCount }" /></span>건 입니다.</p>
+						<div class="list_util">
+<!-- 							<select name="pageUnit" id="pageUnit" onchange="linkPage(1);" title="줄 선택" style="width: 140px"> -->
+<!-- 								<option value="10" selected="">10줄</option> -->
+<!-- 								<option value="20">20줄</option> -->
+<!-- 								<option value="30">30줄</option> -->
+<!-- 								<option value="100">100줄</option> -->
+<!-- 							</select> -->
+							<select name="searchCondition" id="searchCondition" onchange="linkPage(1);" title="분류 선택" style="width: 140px">
+								<option value="">작성여부</option>
+								<option value="10" <c:if test="${adjReqMgrPastVO.searchCondition eq 10 }">selected</c:if>>작성중</option>
+								<option value="20" <c:if test="${adjReqMgrPastVO.searchCondition eq 20 }">selected</c:if>>작성완료</option>
+							</select>
+						</div>
+					</div>
+					<!-- list -->
+					<div class="list tbType01">
+						<table>
+							<colgroup>
+								<col style="width: 7%">
+								<col style="width: 16%">
+								<col style="width: 16%">
+								<col style="width: auto">
+								<col style="width: 17%">
+							</colgroup>
+							<thead>
+								<tr>
+									<th>번호</th>
+									<th>조정번호</th>
+									<th>신청인</th>
+									<th>피신청인</th>
+									<th>조사관</th>
+									<th>조정부</th>
+									<th>저작물종류</th>
+									<th>조정결과<!-- <button class="sort btn_sort" id="sort_RS.ADR_SEQ">▲</button> --></th>
+									<th>작성여부</th>
+								</tr>
+							</thead>
+							<tbody>
+								<c:forEach var="list" items="${list }" varStatus="status">
+									<tr style=" cursor: pointer;" onclick="fn_goDetail('<c:out value="${list.adrSeq }" />')">
+										<td>
+											<c:if test="${adjReqMgrPastVO.searchSortOrd eq 'desc' }">
+					                			<c:out value="${ ( paginationInfo.totalRecordCount - ((adjReqMgrPastVO.pageIndex -1)*adjReqMgrPastVO.pageUnit) ) - status.index }"/>
+						                	</c:if>
+						                	<c:if test="${adjReqMgrPastVO.searchSortOrd eq 'asc' }">
+												<c:out value="${(adjReqMgrPastVO.pageIndex - 1) * adjReqMgrPastVO.pageUnit + status.count}"/>                		
+						                	</c:if>
+				                		</td>
+										<td><c:out value="${list.adrNo }" /></td>
+										<td><c:out value="${list.rpplNm }" /></td>
+										<td><c:out value="${list.prpplNm }" /></td>
+										<td><c:out value="${list.assPstUsrNm }" /></td>
+										<td><c:out value="${list.memDeptNm }" /></td>
+<%-- 										<td><a href="javascript:;" onclick="fn_goDetail('<c:out value="${list.adrSeq }" />')" title="상세페이지로 이동"><kc:code codeId="CC002" code="${list.ccTy}"/></a></td> --%>
+										<td><kc:code codeId="CC002" code="${list.ccTy}"/></td>
+										<td>
+											<c:choose>
+												<c:when test="${empty list.statTx }">
+													-
+												</c:when>
+												<c:otherwise>
+													<c:out value="${list.statTx }" />
+												</c:otherwise>
+											</c:choose>
+										</td>
+										<td>
+											<c:choose>
+												<c:when test="${empty list.adrEndDe }">
+													작성중
+												</c:when>
+												<c:otherwise>
+													작성완료
+												</c:otherwise>
+											</c:choose>
+										</td>
+									</tr>
+								</c:forEach>
+		                    	<c:if test="${empty list}">
+									<tr><td colspan="9"><spring:message code="common.nodata.msg" /></td></tr>
+								</c:if>
+							</tbody>
+						</table>
+					</div>
+					<!-- //list -->
+					<!-- page -->
+		
+					<div class="btn_wrap btn_layout02">
+						<button class="btnType02" onclick="fn_Create(); return false;" >등록</button>
+					</div>
+		
+					<!-- page -->
+					<div class="page">
+						<ui:pagination paginationInfo = "${paginationInfo}"  type="image" jsFunction="linkPage" />
+					</div>
+					<!-- //page -->
+				</div>
+			</div>
+		</div>
+	</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>
+</body>
+</html>

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

@@ -74,11 +74,25 @@ function fn_nextGoPageForm(){
 }
 
 
+function fn_goListPage(){
+
+    var pageForm = document.pageForm ;
+    pageForm.action = "<c:url value='/kccadr/adjReqMgOff/adjReqMgrPastList.do'/>";
+    pageForm.submit();
+
+}
+
+
+
 </script>
 <title>사건진행정보</title>
 </head>
 <body>
 
+<form id="pageForm" name="pageForm" method="post">
+	<input type="hidden" name="pageIndex" id="pageIndex" value="1">
+</form>
+
 <form id="popPageForm" name="popPageForm" method="post">
 	<input type="hidden" id="prtclSeq" name="prtclSeq" value="" /> 
 	<input type="hidden" id="nowAdrSn" name="nowAdrSn" value="" /> 
@@ -173,6 +187,7 @@ function fn_nextGoPageForm(){
 					</div>
 					<div class="area_right">
 						<button type="button" id="goPage" class="btnType06">다음단계 이동 &gt;</button>
+						<button class="btnType04"  onclick="fn_goListPage(); return false;">목록</button>
 					</div>
 				</div>
 				<!-- //page -->

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

@@ -171,7 +171,8 @@ function fn_addRow(len){
  */
 $(document).on('click','#regBtn', function(){
 	
-	if(validate())
+	
+	if(!validate())
 	{
 		return false;
 	}
@@ -219,6 +220,7 @@ $(document).on('click','#regBtn', function(){
                 console.log('data : ', data);
 				if(data.status == 'OK'){
 					alert(data.data);
+					fn_goListPage();
 // 					$('#adrSeq').val(data.dataSub);
 // 					$('#nextGoPageForm').submit();
 				}
@@ -234,27 +236,33 @@ $(document).on('click','#regBtn', function(){
 });
 
 function validate(){
-	
+	var vali = true;
 	$('.trClass').each(function(index, item){
 		// init
 		if($(item).find('.appDeDay').val() == '')
 		{
 			alert("일자를 선택해 주세요");
 			$(item).find('.appDeDay').focus();
+			vali = false;
 			return false;
 		}
 		if($(item).find('#hstryCn').val() == '')
 		{
 			alert("내용을 입력해 주세요");
 			$(item).find('#hstryCn').focus();
+			vali = false;
 			return false;
 		}
 		
 	});
-	
+	return vali;
 }
 
-
+function fn_goListPage(){
+    var pageForm = document.pageForm ;
+    pageForm.action = "<c:url value='/kccadr/adjReqMgOff/adjReqMgrPastList.do'/>";
+    pageForm.submit();
+}
 </script>
 <style type="text/css">
 	.calendarPop {left:-165px;}
@@ -271,6 +279,10 @@ function validate(){
 </head>
 <body>
 
+<form id="pageForm" name="pageForm" method="post">
+	<input type="hidden" name="pageIndex" id="pageIndex" value="1">
+</form>
+
 <form id="regPageForm" name="regPageForm" method="post">
 	<input type="hidden" id="adrSeq" name="adrSeq" value="${adjReqMgrPastVO.adrSeq }">
 </form>
@@ -393,6 +405,7 @@ function validate(){
 					</div>
 					<div class="area_right">
 						<button type="button" id="regBtn" class="btnType06">완료</button>
+						<button class="btnType04"  onclick="fn_goListPage(); return false;">목록</button>
 					</div>
 				</div>
 			</div>

src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentEndDetail.jsp

@@ -0,0 +1,307 @@
+<%@ 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="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
+<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<un:useConstants var="KccadrConstants" className="kcc.kccadr.cmm.KccadrConstants" />
+<% pageContext.setAttribute("replaceChar", "\n"); %>
+
+<!DOCTYPE html>
+<html lang="ko">
+<head>
+<title>조정사건 상세</title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<script src="/kccadrPb/usr/script/popup.js"></script>
+<script type="text/javascript" src="<c:url value="/validator.do"/>"></script>
+<%-- <un:useConstants var="KccadrConstants" className="kcc.kccadr.cmm.KccadrConstants" /> --%>
+<script type="text/javaScript" language="javascript">
+
+    function pageReload() {
+        location.reload();
+    }
+
+    function fncGoList(){
+        var varFrom = document.getElementById("listForm");
+        varFrom.action = "<c:url value='/web/kccadr/accdnt/ai/adjstIncidentEndList.do'/>";
+        varFrom.submit();
+    }
+
+    function fn_egov_downFile(atchFileId, fileSn){
+        window.open("<c:url value='/cmm/fms/FileDown.do?atchFileId="+atchFileId+"&fileSn="+fileSn+"'/>");
+    }
+
+    function fncEdit(step){
+        var varFrom = document.getElementById("editForm");
+        varFrom.action = "/web/kccadr/adjst/adjstReqRegistStep"+step+".do";
+        varFrom.submit();
+
+    }
+
+    function fncEditPopup(){
+        $('#layerPop').load(
+              '/web/kccadr/accdnt/ai/popup/adjstIncidentReqEdit.do'
+            , {"aaa" : "cccc"}
+            , function(res, status, xhr){
+            if(status == "success"){
+                var target = "sch_popup"
+                var showTarget = $('[data-tooltip-con="' + target + '"]');
+                showTarget.show().focus();
+
+                var popWid = showTarget.width();
+                var popHei = showTarget.height();
+
+                var nLeft = (($(window).width() - popWid)/2);
+                var nTop = (($(window).height() - popHei)/2);
+
+                showTarget.css({
+                    "left": nLeft,
+                    "top": nTop
+                });
+                showTarget.find('.tooltip-close').data('activeTarget', target);
+
+                $(".mask").show();
+            }
+        });
+    }
+    
+    /* 상세정보 팝업_퍼블리싱 작업 요청_이준호_220818  */
+    function fncDetailPop() {
+		var popForm = document.popForm;
+		commonPopWindowopenForm("/web/kccadr/accdnt/ai/popup/adjstIncidentDetailPop.do", "840", "800", "adrRpplDetailPop", $('#popForm'));
+	}
+</script>
+</head>
+<body>
+<form:form id="listForm" name="listForm" commandName="adjstIncidentVO" onsubmit="return false;" method="post">
+<input type="hidden" name="pageIndex" value="<c:out value='${adjstIncidentVO.pageIndex}' default='1' />"/>
+<input type="hidden" name="searchSortCnd" value="<c:out value="${adjstIncidentVO.searchSortCnd}" />" />
+<input type="hidden" name="searchSortOrd" value="<c:out value="${adjstIncidentVO.searchSortOrd}" />" />
+<input type="hidden" name="searchStatus" value="<c:out value="${adjstIncidentVO.searchStatus}" />" />
+</form:form>
+
+<form id="popForm" name="popForm" action="<c:url value='/web/kccadr/accdnt/ai/popup/adjstIncidentDetailPop.do'/>" method="post">
+	<input type="hidden" name="adrSeq" id="adrSeq" value="<c:out value='${master.adrSeq}'/>"/>
+</form>
+
+<form:form id="editForm" name="editForm" commandName="adjstIncidentVO" onsubmit="return false;" method="post">
+    <input type="hidden" name="adrSeq" id="adrSeq" value="<c:out value='${master.adrSeq}'/>"/>
+    <input type="hidden" name="adjPageSts" value="Upt"/>
+</form:form>
+<div class="mask"></div>
+<div class="tooltip-wrap" id="layerPop"></div>
+<!-- cont -->
+<div class="cont_wrap sub02_1" id="sub">
+    <div class="inner">
+        <div class="cont_tit">
+            <h2>종결사건 상세</h2>
+        </div>
+        
+        <div class="tb_wrap">
+			<!-- <div class="tb_top">
+			    <p>대리인 정보</p>
+			</div> -->
+			<table class="tbType01">
+			    <caption>종결사건 상세 정보 : 신청인 분류, 저작물 유형, 신청인 이름, 대리인 이름, 피신청인 이름등의 정보제공</caption>
+			    <colgroup>
+			        <col style="width: 250px;">
+			        <col style="width: auto;">
+			        <col style="width: 250px;">
+			        <col style="width: auto;">
+			    </colgroup>
+			    <tbody>
+			    	<c:forEach var="list" items="${relatedPerson}" varStatus="status">
+			        	<c:choose>
+			        		<c:when test="${list.rpplTy eq KccadrConstants.ADR_RPPL_TY_REQ}">
+			                	<!-- 신청인 -->
+			                	<c:set var="sinName" value="${list.rpplNm}"/>
+			                	<c:set var="sinBunryu" value="${list.rpplUsrTyNm}"/>
+			                </c:when>
+			                <c:when test="${list.rpplTy eq KccadrConstants.ADR_RPPL_TY_REQ_DEPUTY}">
+			                	<!-- 대리인 -->
+			                	<c:set var="daeName" value="${list.rpplNm}"/>
+			                </c:when>
+			                <c:otherwise>
+			                </c:otherwise>
+			            </c:choose>
+			        </c:forEach>
+				    <tr>
+				        <th scope="row" class="">
+				            <p>신청인 분류</p>
+				        </th>
+				        <td>
+				        	<p><c:out value="${sinBunryu}"/></p>
+			        	</td>
+				        <th scope="row" class="">
+				            <p>저작물 유형</p>
+				        </th>
+				        <td>
+				        	<p><kc:code codeId="CC002" code="${master.ccTy}"/></p>
+				        </td>
+				    </tr>
+				    <tr>
+				        <th scope="row" class="">
+				            <p>신청인</p>
+				        </th>
+				        <td>
+				        	<p><c:out value="${sinName}"/></p>
+			        	</td>
+				        <th scope="row" class="">
+				            <p>대리인</p>
+				        </th>
+				        <td>
+				        	<p><c:out value="${daeName}"/></p>
+				        </td>
+				    </tr>
+				    <tr>
+				    <c:forEach var="List" items="${piSinList}" varStatus="status">
+						<c:if test="${status.count eq 1}">
+							<th scope="row" class="">
+								<p>피신청인 1</p>
+							</th>
+							<td>
+								<p><c:out value="${List.rpplNm}"/></p>
+							</td>
+						</c:if>
+						<c:if test="${status.count eq 2}">
+							<th scope="row" class="">
+								<p>피신청인 2</p>
+							</th>
+							<td>
+								<p><c:out value="${List.rpplNm}"/></p>
+							</td>
+						</c:if>
+						<c:if test="${status.count eq 3}">
+							</tr>
+							<tr>
+					     		<th scope="row" class="">
+						            <p>피신청인 3</p>
+						        </th>
+						        <td>
+						        	<p><c:out value="${List.rpplNm}"/></p>
+					        	</td>
+					     </c:if>
+					     <c:if test="${status.count eq 4}">
+				     		<th scope="row" class="">
+					            <p>피신청인 4</p>
+					        </th>
+					        <td>
+					        	<p><c:out value="${List.rpplNm}"/></p>
+				        	</td>
+			     		</c:if>
+			     		<c:if test="${status.count eq 5}">
+				     		<tr>
+					     		<th scope="row" class="">
+						            <p>피신청인 5</p>
+						        </th>
+						        <td>
+						        	<p><c:out value="${List.rpplNm}"/></p>
+					        	</td>
+				        	</tr>
+			     		</c:if>
+				    </c:forEach>
+				    </tr>
+		        </tbody>
+		    </table>
+		</div>
+		
+		<div class="btn_wrap btn_layout03">
+            <div class="btn_left"></div>
+            <div class="btn_right">
+                <button type="button" class="btnType08" onclick="fncDetailPop(); return false;">상세정보</button>
+            </div>
+       	</div>
+		
+        <!-- 피신청인 정보 -->
+        <div class="tb_wrap">
+            <div class="tb_top">
+                <p>조정신청 내용</p>
+            </div>
+            <table class="tbType01">
+                <caption>조정신청 내용 : 저작물 종류, 신청취지, 신청원인, 첨부파일등의 정보제공</caption>
+                <colgroup>
+                    <col style="width: 250px;">
+                    <col style="width: auto;">
+                </colgroup>
+                <tbody>
+                <tr>
+                    <th scope="row" class="">
+                        <p>저작물 종류</p>
+                    </th>
+                    <td>
+                    	<p>
+                    		<kc:code codeId="CC002" code="${master.ccTy}"/>
+                        </p>
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row" class="">
+                        <p>신청취지</p>
+                    </th>
+                    <td>
+                        <p>${fn:replace(master.reqCn1, replaceChar, "<br/>")}</p>
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row" class="">
+                        <p>신청원인</p>
+                    </th>
+                    <td>
+                        <p>${fn:replace(master.reqCn2, replaceChar, "<br/>")}</p>
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row" class="">
+                        <p>첨부파일</p>
+                    </th>
+                    <td>
+                    	<ul class="file_list">
+                    	<%--<c:import url="/web/kccadr/kccadrCom/adjstFileDownloadBasicInfo.do"/>--%>
+	                        <c:forEach var="fileList" items="${fileList}" varStatus="status">
+	                            <li><a href="javascript:fn_egov_downFile('<c:out value='${fileList.atchFileId}' />','<c:out value='${fileList.fileSn}' />')" title="다운로드"><c:out value='${fileList.orignlFileNm}' /></a></li>
+	                        </c:forEach>
+                        </ul>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+        <!-- 하단 버튼 -->
+        <div class="btn_wrap btn_layout03">
+            <div class="btn_left"></div>
+            <div class="btn_right">
+	            <%-- 
+	            ADR_REQ_ING						= "101000"; // 작성중
+	            ADR_UPDT_APPR					= "102050"; // 수정요청승인 
+	            ADR_SUPP_REQ					= "103010"; // 보완요청--%>
+                <c:if test="${master.statCd eq KccadrConstants.ADR_REQ_ING 
+                		   or master.statCd eq KccadrConstants.ADR_UPDT_APPR 
+                		   or master.statCd eq KccadrConstants.ADR_SUPP_REQ}">
+                    <button type="button" class="btnType09 btn_edit" onclick="fncEdit('1');">수정</button>
+                </c:if>
+                
+                <%-- 
+	            ADR_REQ_COMP					= "101010"; // 제출완료
+	            ADR_SUPP_COMP					= "103050"; // 보완요청완료
+	            ADR_UPDT_RETN					= "102090"; // 수정요청반려
+	            edtStatus = empty--%>
+                <c:if test="${(master.statCd eq KccadrConstants.ADR_REQ_COMP 
+                		    or master.statCd eq KccadrConstants.ADR_SUPP_COMP 
+                		    or master.statCd eq KccadrConstants.ADR_UPDT_RETN) 
+                		    and empty master.edtStatus}">
+                    <button type="button" class="btnType09 btn_edit" data-tooltip="sch_popup" onclick="fncEditPopup()">수정요청</button>
+                </c:if>
+                <c:if test="${master.statCd le KccadrConstants.ADR_PAY_REQ }">
+	                <button type="button" class="btnType09" onclick="AdjstReq.stepDeleteInDetail('${master.adrSeq}'); return false;">신청서 삭제</button>
+                </c:if>
+                <button type="button" class="btnType11 btn_list" onclick="fncGoList();">목록</button>
+            </div>
+        </div>
+        <!-- //하단 버튼 -->
+    </div>
+</div>
+</body>
+</html>

src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentEndList.jsp

@@ -0,0 +1,349 @@
+<%@ 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"%>
+<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
+<%   
+	response.setHeader("Cache-Control","no-store");   
+	response.setHeader("Pragma","no-cache");   
+	response.setDateHeader("Expires",0);   
+	if (request.getProtocol().equals("HTTP/1.1")) response.setHeader("Cache-Control", "no-cache"); 
+%>
+<un:useConstants var="KccadrConstants" className="kcc.kccadr.cmm.KccadrConstants" />
+<!DOCTYPE html>
+<html lang="ko">
+<head>
+<title>조정사건 목록</title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+
+<link rel="stylesheet" href="/kccadrPb/usr/datepicker/classic.css">
+<link rel="stylesheet" href="/kccadrPb/usr/datepicker/classic.date.css">
+
+<script src="/kccadrPb/usr/script/popup.js"></script>
+<script src="/kccadrPb/usr/datepicker/picker.js"></script>
+<script src="/kccadrPb/usr/datepicker/picker.date.js"></script>
+<script src="/kccadrPb/usr/datepicker/legacy.js"></script>
+<script src="/kccadrPb/usr/datepicker/ko_KR.js"></script>
+<script type="text/javaScript" language="javascript">
+
+//     function fncStatusList(status){
+//         document.listForm.searchStatus.value = status;
+//         document.listForm.searchCondition.value = '';
+//         document.listForm.searchKeyword.value = '';
+//         linkPage(1);
+//     }
+    function fncGoList(){
+        linkPage(1);
+    }
+
+    function linkPage(pageNo){
+        var listForm = document.listForm ;
+        listForm.pageIndex.value = pageNo ;
+        listForm.action = "<c:url value='/web/kccadr/accdnt/ai/adjstIncidentEndList.do'/>";
+        listForm.submit();
+    }
+
+    function fncGoDetail(adrSeq){
+        var listForm = document.listForm ;
+        listForm.adrSeq.value = adrSeq;
+        listForm.action = "<c:url value='/web/kccadr/accdnt/ai/adjstIncidentEndDetail.do'/>";
+        listForm.submit();
+    }
+    
+//     function fncGoingDetail(adrSeq, adrSn){
+//         var listForm = document.listForm ;
+//         listForm.adrSeq.value = adrSeq;
+//         listForm.adrSn.value = adrSn;
+//         listForm.action = "<c:url value='/web/kccadr/accdnt/ars/adjstReqStatusDetail.do'/>";
+//         listForm.submit();
+//     }    
+
+//     function fncCloseDetail(adrSeq, adrSn){
+//         var listForm = document.listForm ;
+//         listForm.adrSeq.value = adrSeq;
+//         listForm.adrSn.value = adrSn;
+//         listForm.action = "<c:url value='/web/kccadr/accdnt/ars/adjstCloseDetail.do'/>";
+//         listForm.submit();
+//     }    
+
+//     function fncGoCreate(){
+//         var listForm = document.listForm ;
+//         //listForm.action = "<c:url value='/web/kccadr/adjst/adjstReq1Regist.do'/>"; // 신청서작성 메뉴 URL로 수정
+//         listForm.action = "<c:url value='/web/kccadr/adjst/adjstReqRegistInformation.do'/>";
+//         listForm.submit();
+//     }
+
+    function fncSecurityPop(adrSeq,edtTy,edtSn) {
+        commonPopLayeropen(
+            "/web/kccadr/accdnt/ai/popup/adjstIncidentReqViewPop.do"
+            , 550
+            , 600
+            , {adrSeq : adrSeq, edtTy : edtTy, edtSn : edtSn}
+            , "N"
+            , "securityPop"
+        );
+    }
+    function fncRejectCnPop(adrSeq,rejectCn) {
+        commonPopLayeropen(
+            "/web/kccadr/accdnt/ai/popup/adjstIncidentRejectCnPop.do"
+            , 550
+            , 300
+            , {adrSeq : adrSeq, rejectCn : rejectCn}
+            , "N"
+            , "rejectCnPop"
+        );
+    }
+    
+    function fnDocIssReqLink(){
+    	location.href = "/web/kccadr/accdnt/ai/docIssReqRegist.do";
+    }
+    
+    
+</script>
+</head>
+<body>
+<form:form id="listForm" name="listForm" commandName="adjstIncidentVO" onsubmit="return false;" method="post">
+<input type="hidden" name="pageIndex" value="<c:out value='${adjstIncidentVO.pageIndex}' default='1' />"/>
+<input type="hidden" name="searchSortCnd" value="<c:out value="${adjstIncidentVO.searchSortCnd}" />" />
+<input type="hidden" name="searchSortOrd" value="<c:out value="${adjstIncidentVO.searchSortOrd}" />" />
+<input type="hidden" name="searchStatus" value="<c:out value="${adjstIncidentVO.searchStatus}" />" />
+<input type="hidden" name="adrSeq" value="" />
+<input type="hidden" name="adrSn" value="" />
+
+<!-- cont -->
+<div class="cont_wrap sub02_1" id="sub">
+    <div class="inner">
+        <div class="cont_tit">
+            <h2>종결사건 목록</h2>
+        </div>
+
+        <!-- list_top -->
+        <div class="list_top">
+            <!-- <p>총 건수 : <span>204</span>건</p> -->
+<!--             <div class="tab_wrap"> -->
+<%--                 <button type="button" onclick="fncStatusList(''); return false;" class="tab ${empty adjstIncidentVO.searchStatus ? 'on' : '' }">전체</button> --%>
+<%--                 <button type="button" onclick="fncStatusList('A'); return false;" class="${adjstIncidentVO.searchStatus eq 'A'? 'on' : '' } tab">신청</button> --%>
+<%--                 <button type="button" onclick="fncStatusList('B'); return false;" class="${adjstIncidentVO.searchStatus eq 'B' ? 'on' : '' } tab">진행</button> --%>
+<%--                 <button type="button" onclick="fncStatusList('C'); return false;" class="${adjstIncidentVO.searchStatus eq 'C' ? 'on' : '' } tab">종결</button> --%>
+<!--             </div> -->
+            <div class="list_util">
+                <label for="searchCondition">검색조건 선택</label>
+                <select name="searchCondition" id="searchCondition" class="subSearch">
+                    <option value="1" ${adjstIncidentVO.searchCondition eq '1' ? 'selected' : '' }>조정번호</option>
+                    <option value="2" ${adjstIncidentVO.searchCondition eq '2' ? 'selected' : '' }>접수기간</option>
+                    <option value="3" ${adjstIncidentVO.searchCondition eq '3' ? 'selected' : '' }>신청인명</option>
+                    <option value="4" ${adjstIncidentVO.searchCondition eq '4' ? 'selected' : '' }>피신청인명</option>
+                    <option value="5" ${adjstIncidentVO.searchCondition eq '5' ? 'selected' : '' }>신청내용</option>
+                    <c:if test="${adjstIncidentVO.searchStatus ne 'B'}">
+                        <option value="6" ${adjstIncidentVO.searchCondition eq '6' ? 'selected' : '' }>조정상태</option>
+                    </c:if>
+                </select>
+				
+                <div class="sel_date">
+                	<div class="calendar_wrap">
+                    	<input type="text" class="searchStartDt startDate inp" title="검색시작일" id="searchStartDt" name="searchStartDt" value="${adjstIncidentVO.searchStartDt}" data-datecontrol="true" onclick="return calendarOpen('searchStartDt-lry','',this);" onfocus="return calendarOpen('searchStartDt-lry','',this);"  onkeyup="this.value = date_mask(this.value)" maxlength="10">
+                    	<button type="button" title="달력 팝업 열기" class="btn_start btn_cal" onclick="return calendarOpen('searchStartDt-lry','',this);"><i></i></button>
+                    </div>
+                    <!-- <div class="calendar_in" id="calendarName_startDate" style="z-index: 9;">
+                        <button type="button" value="달력 팝업 열기" onclick="return calendarOpen('searchStartDt-lry','',this)" class="btn_cal"></button>
+                        <div id="searchStartDt-lry" class="calendarPop" style="display: none;">
+                            <iframe id="searchStartDt-ifrm" name="searchStartDt-ifrm" class="calendar-frame" src="/kccadrPb/usr/mini_calendar.html" title="달력 팝업" frameborder="0" scrolling="no"></iframe>
+                        </div>
+                    </div> --> ~
+                    <div class="calendar_wrap">
+                    	<input type="text" class="searchEndDt endDate inp" title="검색종료일" id="searchEndDt" name="searchEndDt" value="${adjstIncidentVO.searchEndDt}" data-datecontrol="true" onclick="return calendarOpen2('searchEndDt-lry','',this);" onfocus="return calendarOpen2('searchEndDt-lry','',this);"  onkeyup="this.value = date_mask(this.value)" maxlength="10">
+                    	<button type="button" title="달력 팝업 열기" class="btn_end btn_cal" onclick="return calendarOpen2('searchEndDt-lry','',this);" ><i></i></button>
+                    </div>
+                    <!-- <div class="calendar_in" id="calendarName_endDate" style="z-index: 9;">
+                        <button type="button" value="달력 팝업 열기" onclick="return calendarOpen('searchEndDt-lry','',this)" class="btn_cal"></button>
+                        <div id="searchEndDt-lry" class="calendarPop" style="display: none;">
+                            <iframe id="searchEndDt-ifrm" name="searchEndDt-ifrm" class="calendar-frame" src="/kccadrPb/usr/mini_calendar.html" title=" 달력 팝업" frameborder="0" scrolling="no"></iframe>
+                        </div>
+                    </div> -->
+                </div>
+                <div class="select_wrap">
+					<label for="searchSelStatus">조정상태 선택</label>
+                	<kc:select codeId="CC022" name="searchSelStatus" id="searchSelStatus" defaultValue="" defaultText="선택" selectedValue="${adjstIncidentVO.searchSelStatus}" between="201010,309050"  styleClass="select_status"/>
+                </div>
+                <div class="input_wrap">
+	                <label for="searchKeyword">검색어 입력</label>
+	                <input type="text" class="search_input" id=searchKeyword name="searchKeyword"  placeholder="검색어를 입력하세요" value="<c:out value='${adjstIncidentVO.searchKeyword}'/>">
+                </div>
+                <button class="btn_search" onclick="fncGoList();">검색</button>
+            </div>
+        </div>
+        <!-- //list_top -->
+
+        <!-- list -->
+        <div class="tb_list01">
+            <table>                
+                <colgroup>
+                    <col style="width: 80px;">
+                    <col style="width: 12%;">
+                    <col style="width: 12%;">
+                    <col style="width: 12%;">
+                    
+                    <col style="width: 12%;">
+                    <col style="width: auto;">
+                    <col style="width: 12%;">
+<%--                     <col style="width: 12%;"> --%>
+                    <col style="width: 12%;">
+<%--                     <col style="width: 140px;"> --%>
+                    <col style="width: 12%;">
+                </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">사건번호</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_REQ_CN1"></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">열람신청</th>
+                </tr>
+                </thead>
+                <tbody>
+                <c:forEach var="list" items="${list}" varStatus="status">
+                    <tr>
+                        <td class="td_num">
+                            <c:if test="${adjstIncidentVO.searchSortOrd eq 'desc' }">
+                                <c:out value="${ ( paginationInfo.totalRecordCount - ((adjstIncidentVO.pageIndex -1)*adjstIncidentVO.pageUnit) ) - status.index }"/>
+                            </c:if>
+                            <c:if test="${adjstIncidentVO.searchSortOrd eq 'asc' }">
+                                <c:out value="${(adjstIncidentVO.pageIndex - 1) * adjstIncidentVO.pageUnit + status.count}"/>
+                            </c:if>
+                        </td>
+                        <td class="td_date">
+                        	<span class="read_only m_th_text">접수일자</span>
+                            <p><c:out value="${list.sbmtDe}"/></p>
+                        </td>
+                        <td class="td_date">
+                        	<span class="read_only m_th_text">조정번호</span>
+                            <p><c:out value="${list.adrNo}"/></p>
+                        </td>
+<%--                         <c:choose> --%>
+                        
+<%--                         	<c:when test="${list.statCd == '309050' || list.statCd == '310050' || list.statCd == '311050'}"> --%>
+<%--                         		종결상세 --%>
+<!-- 		                        <td class="td_subscriber"> -->
+<!-- 		                        	<span class="m_th_text">신청인</span> -->
+<%-- 		                            <a href="#none" onclick="fncCloseDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.appliCantNm}"/></a> --%>
+<!-- 		                        </td> -->
+<!-- 		                        <td class="td_respondent"> -->
+<!-- 		                        	<span class="m_th_text">피신청인</span> -->
+<%-- 		                            <a href="#none" onclick="fncCloseDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.resPonDentNm}"/></a> --%>
+<!-- 		                        </td> -->
+<!-- 		                        <td class="td_tit"> -->
+<!-- 		                        	<div class="hover_content_wrap"> -->
+<!-- 			                        	<span class="read_only m_th_text">신청내용</span> -->
+<%-- 			                            <a href="#none" onclick="fncCloseDetail('${list.adrSeq}', '${list.adrSn}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a> --%>
+<!-- 		                            	<div class="hover_content_box"> -->
+<!-- 		                            		신청취지 : 피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(￦3,000,000)을 지급한다. -->
+<!-- 		                            	</div> -->
+<!-- 	                            	</div> -->
+<!-- 		                        </td> -->
+<%--                         	</c:when> --%>
+<%--                         	<c:when test="${list.statCd eq '101050' or (list.statCd >= '201010' and list.statCd <= '309050')}"> --%>
+<!-- 		                        <td class="td_subscriber"> -->
+<!-- 		                        	<span class="m_th_text">신청인</span> -->
+<%-- 		                            <a href="#none" onclick="fncGoingDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.appliCantNm}"/></a> --%>
+<!-- 		                        </td> -->
+<!-- 		                        <td class="td_respondent"> -->
+<!-- 		                        	<span class="m_th_text">피신청인</span> -->
+<%-- 		                            <a href="#none" onclick="fncGoingDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.resPonDentNm}"/></a> --%>
+<!-- 		                        </td> -->
+<!-- 		                        <td class="td_tit"> -->
+<!-- 		                        	<div class="hover_content_wrap"> -->
+<!-- 			                        	<span class="read_only m_th_text">신청내용</span> -->
+<%-- 			                            <a href="#none" onclick="fncGoingDetail('${list.adrSeq}', '${list.adrSn}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a> --%>
+<!-- 		                            	<div class="hover_content_box"> -->
+<!-- 		                            		신청취지 : 피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(￦3,000,000)을 지급한다. -->
+<!-- 		                            	</div> -->
+<!-- 	                            	</div> -->
+<!-- 		                        </td>                        		 -->
+<%--                         	</c:when> --%>
+                        	
+<%--                         	<c:otherwise> --%>
+		                        <td class="td_subscriber">
+		                        	<span class="m_th_text">신청인</span>
+		                            <a href="#none" onclick="fncGoDetail('${list.adrSeq}');"><c:out value="${list.appliCantNm}"/></a>
+		                        </td>
+		                        <td class="td_respondent">
+		                        	<span class="m_th_text">피신청인</span>
+		                            <a href="#none" onclick="fncGoDetail('${list.adrSeq}');"><c:out value="${list.resPonDentNm}"/></a>
+		                        </td>
+		                        <td class="td_tit">
+		                        	<div class="hover_content_wrap">
+			                        	<span class="read_only m_th_text">신청내용</span>
+			                            <a href="#none" onclick="fncGoDetail('${list.adrSeq}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a>
+		                            	<div class="hover_content_box">
+		                            		신청취지 : 피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(￦3,000,000)을 지급한다.
+		                            	</div>
+	                            	</div>
+		                        </td>                        		
+<%--                         	</c:otherwise> --%>
+<%--                         </c:choose> --%>
+                        <td>
+                        	<span class="m_th_text">조정부</span>
+                            <p><c:out value="${empty list.memDeptNm ? '-' : list.memDeptNm}"/></p>
+                        </td>
+                        <td>
+                        	<span class="m_th_text">기일</span>
+                            <p><c:out value="${empty list.appDe ? '-' : list.appDe}"/></p>
+                        </td>
+<!--                         <td> -->
+<!--                         	<span class="m_th_text">조정차수</span> -->
+<%--                             <p><c:out value="${empty list.adrSn ? '-' : list.adrSn}"/>${empty list.adrSn ? '' : '차'}</p> --%>
+<!--                         </td> -->
+                        <%-- <td class="td_status">
+                        	<span class="read_only m_th_text">조정상태</span>
+                            <c:choose>
+                                <c:when test="${(list.statCd eq KccadrConstants.ADR_UPDT_APPR) or (list.statCd eq KccadrConstants.ADR_SUPP_REQ)}">
+                                    <button class="status_scrq" data-tooltip="sch_${list.adrSeq}_popup" onclick="fncSecurityPop('${list.adrSeq}','${list.edtTy}','${list.edtSn}')" title="팝업 열림" style="cursor: pointer"><kc:code codeId="CC022" code="${list.statCd}"/></button>
+                                </c:when>
+                                <c:when test="${(list.statCd eq KccadrConstants.ADR_REQ_RETN)}">
+                                    <button class="status_scrq" data-tooltip="sch_${list.adrSeq}_popup" onclick="fncRejectCnPop('${list.adrSeq}','${list.rejectCn}')" title="팝업 열림" style="cursor: pointer"><kc:code codeId="CC022" code="${list.statCd}"/></button>
+                                </c:when>
+                                <c:otherwise>
+                                    <p class="status_write"><kc:code codeId="CC022" code="${list.statCd}"/></p>
+                                </c:otherwise>
+                            </c:choose>
+                        </td> --%>
+                        <td class="td_status">
+                        	<span class="read_only m_th_text">열람신청</span>
+                        	<button type="button" class="status_scrq" id="" onclick="fnDocIssReqLink();">열람신청</button>
+                        </td>
+                    </tr>
+                </c:forEach>
+                <c:if test="${empty list}">
+                    <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>
+</form:form>
+</div>
+</body>
+</html>

src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp

@@ -97,6 +97,12 @@
 		$(".step_wrap").addClass("num0" + stepNum);
 		/* //step 개수에 따라 width 변동 */
 	})
+	
+	//송달정보 조회
+	function fnPostChk(){
+		commonPopWindowopenForm("/web/kccadr/kccadrCom/postCheckLink.do?sid=123", "1200", "1000", "postChkPop", $('#pop'));
+// 		location.href = "/web/kccadr/kccadrCom/postCheckLink.do?sid=123";
+	}
 </script>
 <!-- 워크플로우용 스크립트 시작 -->
 						<!-- A320 취하신청 -->
@@ -313,6 +319,12 @@ resInfo--%>
 				</div>
 			</c:if>
 			
+			<select class="exp_select" id="dlvryInfoSelect">
+				<option value="기일통지서">기일통지서</option>
+				<option value="기일조서">기일조서</option>
+			</select>
+			<button type="button" class="btnType07" onclick="fnPostChk();" style="vertical-align:middle;">송달정보 조회</button>
+
 			<div class="tb_wrap">
 				<table class="tbType01">
 					<caption>신청인, 대리인, 피신청인1, 피신청인2등의 정보제공</caption>

src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqList.jsp

@@ -175,26 +175,30 @@
             <table>                
                 <colgroup>
                     <col style="width: 80px;">
+                    <col style="width: 20%;">
+                    <col style="width: 15%;">
+                    <col style="width: 15%;">
+                    <col style="width: 15%;">
+                    <col style="width: auto%;">
+                    <%-- <col style="width: auto;">
                     <col style="width: 10%;">
                     <col style="width: 10%;">
                     <col style="width: 10%;">
-                    <col style="width: auto;">
+                    <col style="width: 140px;"> --%>
-                    <col style="width: 10%;">
-                    <col style="width: 10%;">
-                    <col style="width: 10%;">
-                    <col style="width: 140px;">
                 </colgroup>
                 <thead>
                 <tr>
-                    <th scope="col">번호<%--<button class="sort btn_sort" id="sort_ADR_SEQ">▲</button>--%></th>
+                    <th scope="col">번호</th>
-                    <th scope="col">신청일자<%--<button type="button" class="sort sortBtn" id="sort_SBMT_DE"></button>--%></th>
+                    <th scope="col">신청일자</th>
-                    <th scope="col">조정번호<%--<button type="button" class="sort sortBtn" id="sort_APPLI_CANT_NM"></button>--%></th>
+                    <th scope="col">조정번호</th>
-                    <th scope="col">신청인<%--<button type="button" class="sort sortBtn" id="sort_APPLI_CANT_NM"></button>--%></th>
+                    <th scope="col">신청인</th>
-                    <th scope="col">신청대상자<%--<button type="button" class="sort sortBtn" id="sort_RES_PON_DENT_NM"></button>--%></th>
+                    <th scope="col">신청서류</th>
-                    <th scope="col">신청내용<%--<button type="button" class="sort sortBtn" id="sort_DEPU_TY_NM"></button>--%></th>
+                    <th scope="col">처리상태</th>
-                    <th scope="col">신청유형<%--<button type="button" class="sort sortBtn" id="sort_REQ_CN1"></button>--%></th>
+                    <!-- <th scope="col">신청대상자</th>
-                    <th scope="col">종결상태<%--<button type="button" class="sort sortBtn" id="sort_REQ_CN1"></button>--%></th>
+                    <th scope="col">신청내용</th>
-                    <th scope="col">진행상태<%--<button type="button" class="sort sortBtn" id="sort_REQ_CN1"></button>--%></th>
+                    <th scope="col">신청유형</th>
+                    <th scope="col">종결상태</th>
+                    <th scope="col">진행상태</th> -->
                 </tr>
                 </thead>
                 <tbody>
@@ -212,36 +216,6 @@
                         	<span class="read_only m_th_text">신청일자</span>
                             <p><c:out value="${list.docuReqRegistPnttm}"/></p>
                         </td>
-                        <%-- <c:choose>
-                        	<c:when test="${list.statCd eq '101050' or (list.statCd >= '201010' and list.statCd <= '309050')}">
-		                        <td class="td_subscriber">
-		                        	<span class="m_th_text">신청인</span>
-		                            <a href="#none" onclick="fncGoingDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.appliCantNm}"/></a>
-		                        </td>
-		                        <td class="td_respondent">
-		                        	<span class="m_th_text">피신청인</span>
-		                            <a href="#none" onclick="fncGoingDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.resPonDentNm}"/></a>
-		                        </td>
-		                        <td class="td_tit">
-		                        	<span class="read_only m_th_text">신청내용</span>
-		                            <a href="#none" onclick="fncGoingDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.reqCn1}"/></a>
-		                        </td>                        		
-                        	</c:when>
-                        	<c:otherwise>
-		                        <td class="td_subscriber">
-		                        	<span class="m_th_text">신청인</span>
-		                            <a href="#none" onclick="fncGoDetail('${list.adrSeq}');"><c:out value="${list.appliCantNm}"/></a>
-		                        </td>
-		                        <td class="td_respondent">
-		                        	<span class="m_th_text">피신청인</span>
-		                            <a href="#none" onclick="fncGoDetail('${list.adrSeq}');"><c:out value="${list.resPonDentNm}"/></a>
-		                        </td>
-		                        <td class="td_tit">
-		                        	<span class="read_only m_th_text">신청내용</span>
-		                            <a href="#none" onclick="fncGoDetail('${list.adrSeq}');"><c:out value="${list.reqCn1}"/></a>
-		                        </td>                        		
-                        	</c:otherwise>
-                        </c:choose> --%>
                         <td class="td_subscriber">
                         	<span class="m_th_text">조정번호</span>
                             <c:out value="${list.adrNo}"/>
@@ -250,19 +224,27 @@
                         	<span class="m_th_text">신청인</span>
                             <c:out value="${list.docReqNm}"/>
                         </td>
-                        <td>
+                        <td class="td_subscriber">
+                        	<span class="m_th_text">신청서류</span>
+                        	<p></p>
+                        </td>
+                        <td class="td_subscriber">
+                        	<span class="m_th_text">처리상태</span>
+                        	<p></p>
+                        </td>
+                        <%-- <td>
                         	<span class="m_th_text">신청 대상자</span>
                             <p><kc:code codeId="CC005" code="${list.rpplTy}"/></p>
-                        </td>
+                        </td> --%>
-                        <td>
+                        <%-- <td>
                         	<span class="m_th_text">신청내용</span>
                             <p><c:out value="${list.docuReqCn}"/></p>
-                        </td>
+                        </td> --%>
-                        <td>
+                        <%-- <td>
                         	<span class="m_th_text">신청유형</span>
                             <p><kc:code codeId="CC042" code="${list.docuReqCd}"/></p>
-                        </td>
+                        </td> --%>
-                        <td>
+                        <%-- <td>
                         	<span class="m_th_text">종결상태</span>
                             <p>
                             	<c:set var="finalStatNm">
@@ -270,27 +252,15 @@
                             	</c:set>
                             	<c:out value="${fn:replace(finalStatNm, '완료', '')}" />
                             </p>
-                        </td>
+                        </td> --%>
-                        <td>
+                        <%-- <td>
                         	<span class="m_th_text">진행상태</span>
                             <p><kc:code codeId="CC013" code="${list.docuReqConfirmCd}"/></p>
-                        </td>
-                        
-                        <%-- <td class="td_status">
-                        	<span class="read_only m_th_text">조정상태</span>
-                            <c:choose>
-                                <c:when test="${list.statCd eq KccadrConstants.ADR_UPDT_APPR or list.statCd eq KccadrConstants.ADR_SUPP_REQ}">
-                                    <button class="status_write" data-tooltip="sch_${list.adrSeq}_popup" onclick="fncSecurityPop('${list.adrSeq}','${list.edtTy}','${list.edtSn}')" style="cursor: pointer"><kc:code codeId="CC022" code="${list.statCd}"/></button>
-                                </c:when>
-                                <c:otherwise>
-                                    <p class="status_write"><kc:code codeId="CC022" code="${list.statCd}"/></p>
-                                </c:otherwise>
-                            </c:choose>
                         </td> --%>
                     </tr>
                 </c:forEach>
                 <c:if test="${empty list}">
-                    <tr><td colspan="9"><spring:message code="common.nodata.msg" /></td></tr>
+                    <tr><td colspan="6"><spring:message code="common.nodata.msg" /></td></tr>
                 </c:if>
                 </tbody>
             </table>
@@ -299,7 +269,7 @@
 
         <!-- 하단 버튼 -->
         <div class="btn_wrap btn_layout01">
-            <button class="btnType09" onclick="fn_goRegist()">등록</button>
+            <button class="btnType09" onclick="fn_goRegist()">기록열람신청</button>
         </div>
         <!-- //하단 버튼 -->
 

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

@@ -10,6 +10,9 @@
         $('#memDeptNm').val($('#memDeptNmTemp').val());
         $('#assPstUsrNm').val($('#assPstUsrNmTemp').val()); 
         
+        console.log(' !! ', $('#adrSn').val());
+        console.log(' !! ', $('#frstRegistPnttm').val());
+        console.log(' !! ', $('#lastUpdtPnttm').val());
 
         
 
@@ -29,7 +32,7 @@
 			var rppl00RealPost = $('#rppl00RealPost').val();
 			var rppl00RealAddrDtl = $('#rppl00RealAddrDtl').val();
 			
-			/*if( rppl00Nm == ""){
+			if( rppl00Nm == ""){
 				
 				alert("대리인 이름을 입력해 주세요.");
 				return false;
@@ -50,40 +53,40 @@
 				
 			}
 			
-			if(rppl00Email1 == ""){
+//			if(rppl00Email1 == ""){
+//				
+//				alert("대리인 이메일을 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-				alert("대리인 이메일을 입력해 주세요.");
+//			if(rppl00Email2 == ""){
-				return false;
+//				
+//				alert("대리인 이메일 도메인 정보를 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-			}
+//			if(rppl00Phone1 == ""){
+//				
+//				alert("대리인 연락처 정보를 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-			if(rppl00Email2 == ""){
+//			if(rppl00Phone2 == ""){
+//				
+//				alert("대리인 연락처 정보를 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-				alert("대리인 이메일 도메인 정보를 입력해 주세요.");
+//			if(rppl00Phone3 == ""){
-				return false;
+//				
-				
+//				alert("대리인 연락처 정보를 입력해 주세요.");
-			}
+//				return false;
-			
+//				
-			if(rppl00Phone1 == ""){
+//			}
-				
-				alert("대리인 연락처 정보를 입력해 주세요.");
-				return false;
-				
-			}
-			
-			if(rppl00Phone2 == ""){
-				
-				alert("대리인 연락처 정보를 입력해 주세요.");
-				return false;
-				
-			}
-			
-			if(rppl00Phone3 == ""){
-				
-				alert("대리인 연락처 정보를 입력해 주세요.");
-				return false;
-				
-			}
 			
 			if(rppl00RealPost == ""){
 				
@@ -97,7 +100,7 @@
 				alert("대리인 우편물 수령지 상세주소 정보를 입력해 주세요.");
 				return false;
 				
-			}*/
+			}
 			
 			if($('#rppl00Email1')){
 				
@@ -126,12 +129,12 @@
 			
 			var rppl0101Nm = $('#rppl0101Nm').val();
 			
-			/*if(rppl0101Nm == ""){
+			if(rppl0101Nm == ""){
 				
 				alert("신청인 이름을 입력해 주세요.");
 				return false;
 				
-			}*/
+			}
 	 		
 		}else if(rpplUsrTy == "02"){ // 법인일 경우
 			
@@ -139,7 +142,7 @@
 			var rppl01BizNm = $('#rppl01BizNm').val();
 			var rppl01BizId = $('#rppl01BizId').val();
 			
-			/*if(rppl0102Nm == ""){
+			if(rppl0102Nm == ""){
 				
 				alert("신청인 대표자 이름을 입력해 주세요.");
 				return false;
@@ -158,14 +161,14 @@
 				alert("신청인 법인등록번호를 입력해 주세요.");
 				return false;
 				
-			}*/
+			}
 			
 		}else { // 개인 사업자인 경우 
 			
 			var rppl0103Nm = $('#rppl0103Nm').val();
 			var rppl01BizNo = $('#rppl01BizNo').val();
 			
-		/*	if(rppl0103Nm == ""){
+			if(rppl0103Nm == ""){
 				
 				alert("신청인 개인 사업자 이름을 입력해 주세요.");
 				return false;
@@ -177,7 +180,7 @@
 				alert("신청인 사업자 등록번호를 입력해 주세요.");
 				return false;
 				
-			}*/
+			}
 			
 		}
 		
@@ -192,7 +195,7 @@
 		var rppl01RealPost = $('#rppl01RealPost').val();
 		var rppl01RealAddrDtl = $('#rppl01RealAddrDtl').val();
 		
-		/*if(rppl01Post == ""){
+		if(rppl01Post == ""){
 			
 			alert("신청인 주소 우편번호를 입력해 주세요.");
 			return false;
@@ -206,40 +209,40 @@
 			
 		}
 		
-		if(rppl01Email1 == ""){
+//		if(rppl01Email1 == ""){
+//			
+//			alert("신청인 이메일을 입력해 주세요.");
+//			return false;
+//			
+//		}
 		
-			alert("신청인 이메일을 입력해 주세요.");
+//		if(rppl01Email2 == ""){
-			return false;
+//			
+//			alert("신청인 이메일 도메인 정보를 입력해 주세요.");
+//			return false;
+//			
+//		}
 		
-		}
+//		if(rppl01Phone1 == ""){
-		
+//			
-		if(rppl01Email2 == ""){
+//			alert("신청인 연락처 정보를 입력해 주세요.");
-			
+//			return false;
-			alert("신청인 이메일 도메인 정보를 입력해 주세요.");
+//			
-			return false;
+//		}
-			
+//		
-		}
+//		if(rppl01Phone2 == ""){
-		
+//			
-		if(rppl01Phone1 == ""){
+//			alert("신청인 연락처 정보를 입력해 주세요.");
-			
+//			return false;
-			alert("신청인 연락처 정보를 입력해 주세요.");
+//			
-			return false;
+//		}
-			
+//		
-		}
+//		if(rppl01Phone3 == ""){
-		
+//			
-		if(rppl01Phone2 == ""){
+//			alert("신청인 연락처 정보를 입력해 주세요.");
-			
+//			return false;
-			alert("신청인 연락처 정보를 입력해 주세요.");
+//			
-			return false;
+//		}
-			
-		}
-		
-		if(rppl01Phone3 == ""){
-			
-			alert("신청인 연락처 정보를 입력해 주세요.");
-			return false;
-			
-		}
 		
 		if(rppl01RealPost == ""){
 			
@@ -253,7 +256,7 @@
 			alert("신청인 우편물 수령지 상세주소 정보를 입력해 주세요.");
 			return false;
 			
-		}*/
+		}
 		
 		//신청인 이메일정보 합쳐주기
 		var rppl01Email1 = $('#rppl01Email1').val();
@@ -280,12 +283,12 @@
 				
 				var rppl0201Nm = $('#rppl0201Nm').val();
 				
-				/*if(rppl0201Nm == ""){
+				if(rppl0201Nm == ""){
 					
 					alert("피신청인 이름을 입력해 주세요.");
 					return false;
 					
-				}*/
+				}
 		 		
 			}else if(rppl02UsrTy == "02"){ // 법인일 경우
 				
@@ -293,7 +296,7 @@
 				var rppl02BizNm = $('#rppl02BizNm').val();
 				var rppl02BizId = $('#rppl02BizId').val();
 				
-				/*if(rppl0202Nm == ""){
+				if(rppl0202Nm == ""){
 					
 					alert("피신청인 대표자 이름을 입력해 주세요.");
 					return false;
@@ -312,14 +315,14 @@
 					alert("피신청인 법인등록번호를 입력해 주세요.");
 					return false;
 					
-				}*/
+				}
 				
 			}else { // 개인 사업자인 경우 
 				
 				var rppl0203Nm = $('#rppl0203Nm').val();
 				var rppl02BizNo = $('#rppl02BizNo').val();
 				
-				/*if(rppl0203Nm == ""){
+				if(rppl0203Nm == ""){
 					
 					alert("피신청인 개인 사업자 이름을 입력해 주세요.");
 					return false;
@@ -331,7 +334,7 @@
 					alert("피신청인 개인 사업자 등록번호를 입력해 주세요.");
 					return false;
 					
-				}*/
+				}
 				
 			}
 			
@@ -346,7 +349,7 @@
 			var rppl02RealPost = $('#rppl02RealPost').val();
 			var rppl02RealAddrDtl = $('#rppl02RealAddrDtl').val();
 			
-			/*if(rppl02Post == ""){
+			if(rppl02Post == ""){
 				
 				alert("피신청인 주소 우편번호를 입력해 주세요.");
 				return false;
@@ -360,13 +363,13 @@
 				
 			}
 			
-			if(rppl02Email1 == ""){
+//			if(rppl02Email1 == ""){
-				
+//				
-				alert("피신청인 이메일을 입력해 주세요.");
+//				alert("피신청인 이메일을 입력해 주세요.");
-				return false;
+//				return false;
-				
+//				
-			}
+//			}
-			
+//			
 			if(rppl02Email2 == ""){
 				
 				alert("피신청인 이메일 도메인 정보를 입력해 주세요.");
@@ -374,26 +377,26 @@
 				
 			}
 			
-			if(rppl02Phone1 == ""){
+//			if(rppl02Phone1 == ""){
+//				
+//				alert("피신청인 신청인 연락처 정보를 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-				alert("피신청인 신청인 연락처 정보를 입력해 주세요.");
+//			if(rppl02Phone2 == ""){
-				return false;
+//				
+//				alert("피신청인 신청인 연락처 정보를 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-			}
+//			if(rppl02Phone3 == ""){
-			
+//				
-			if(rppl02Phone2 == ""){
+//				alert("피신청인 신청인 연락처 정보를 입력해 주세요.");
-				
+//				return false;
-				alert("피신청인 신청인 연락처 정보를 입력해 주세요.");
+//				
-				return false;
+//			}
-				
-			}
-			
-			if(rppl02Phone3 == ""){
-				
-				alert("피신청인 신청인 연락처 정보를 입력해 주세요.");
-				return false;
-				
-			}
 			
 			if(rppl02RealPost == ""){
 				
@@ -407,7 +410,7 @@
 				alert("우편물 수령지 상세주소 정보를 입력해 주세요.");
 				return false;
 				
-			}*/
+			}
 			
 			//신청인 이메일정보 합쳐주기
 			var rppl02Email1 = $('#rppl02Email1').val();
@@ -433,12 +436,12 @@
 				
 				var rppl0301Nm = $('#rppl0301Nm').val();
 				
-				/*if(rppl0301Nm == ""){
+				if(rppl0301Nm == ""){
 					
 					alert("피신청인 이름을 입력해 주세요.");
 					return false;
 					
-				}*/
+				}
 
 			}else if(rppl03UsrTy == "02"){ // 법인일 경우
 				
@@ -446,7 +449,7 @@
 				var rppl03BizNm = $('#rppl03BizNm').val();
 				var rppl03BizId = $('#rppl03BizId').val();
 				
-				/*if(rppl0302Nm == ""){
+				if(rppl0302Nm == ""){
 					
 					alert("피신청인 대표자 이름을 입력해 주세요.");
 					return false;
@@ -465,14 +468,14 @@
 					alert("피신청인 법인등록번호를 입력해 주세요.");
 					return false;
 					
-				}*/
+				}
 				
 			}else { // 개인 사업자인 경우 
 				
 				var rppl0303Nm = $('#rppl0303Nm').val();
 				var rppl03BizNo = $('#rppl03BizNo').val();
 				
-				/*if(rppl0303Nm == ""){
+				if(rppl0303Nm == ""){
 					
 					alert("피신청인 개인 사업자 이름을 입력해 주세요.");
 					return false;
@@ -484,7 +487,7 @@
 					alert("피신청인 사업자 등록번호를 입력해 주세요.");
 					return false;
 					
-				}*/
+				}
 				
 			}
 			
@@ -499,7 +502,7 @@
 			var rppl03RealPost = $('#rppl03RealPost').val();
 			var rppl03RealAddrDtl = $('#rppl03RealAddrDtl').val();
 			
-			/*if(rppl03Post == ""){
+			if(rppl03Post == ""){
 				
 				alert("피신청인 주소 우편번호를 입력해 주세요.");
 				return false;
@@ -513,40 +516,40 @@
 				
 			}
 			
-			if(rppl03Email1 == ""){
+//			if(rppl03Email1 == ""){
+//				
+//				alert("피신청인 이메일을 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-				alert("피신청인 이메일을 입력해 주세요.");
+//			if(rppl03Email2 == ""){
-				return false;
+//				
+//				alert("피신청인 이메일 도메인 정보를 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-			}
+//			if(rppl03Phone1 == ""){
+//				
+//				alert("피신청인 연락처 정보를 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-			if(rppl03Email2 == ""){
+//			if(rppl03Phone2 == ""){
+//				
+//				alert("피신청인 연락처 정보를 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-				alert("피신청인 이메일 도메인 정보를 입력해 주세요.");
+//			if(rppl03Phone3 == ""){
-				return false;
+//				
-				
+//				alert("피신청인 연락처 정보를 입력해 주세요.");
-			}
+//				return false;
-			
+//				
-			if(rppl03Phone1 == ""){
+//			}
-				
-				alert("피신청인 연락처 정보를 입력해 주세요.");
-				return false;
-				
-			}
-			
-			if(rppl03Phone2 == ""){
-				
-				alert("피신청인 연락처 정보를 입력해 주세요.");
-				return false;
-				
-			}
-			
-			if(rppl03Phone3 == ""){
-				
-				alert("피신청인 연락처 정보를 입력해 주세요.");
-				return false;
-				
-			}
 			
 			if(rppl03RealPost == ""){
 				
@@ -560,7 +563,7 @@
 				alert("피신청인 우편물 수령지 상세주소 정보를 입력해 주세요.");
 				return false;
 				
-			}*/
+			}
 			
 			//신청인 이메일정보 합쳐주기
 			var rppl03Email1 = $('#rppl03Email1').val();
@@ -586,12 +589,12 @@
 				
 				var rppl0401Nm = $('#rppl0401Nm').val();
 				
-				/*if(rppl0401Nm == ""){
+				if(rppl0401Nm == ""){
 					
 					alert("피신청인 이름을 입력해 주세요.");
 					return false;
 					
-				}*/
+				}
 		 		
 			}else if(rppl04UsrTy == "02"){ // 법인일 경우
 				
@@ -599,7 +602,7 @@
 				var rppl04BizNm = $('#rppl04BizNm').val();
 				var rppl04BizId = $('#rppl04BizId').val();
 				
-				/*if(rppl0402Nm == ""){
+				if(rppl0402Nm == ""){
 					
 					alert("피신청인 대표자 이름을 입력해 주세요.");
 					return false;
@@ -618,14 +621,14 @@
 					alert("피신청인 법인등록번호를 입력해 주세요.");
 					return false;
 					
-				}*/
+				}
 				
 			}else { // 개인 사업자인 경우 
 				
 				var rppl0403Nm = $('#rppl0403Nm').val();
 				var rppl04BizNo = $('#rppl04BizNo').val();
 				
-				/*if(rppl0403Nm == ""){
+				if(rppl0403Nm == ""){
 					
 					alert("피신청인 개인 사업자 이름을 입력해 주세요.");
 					return false;
@@ -637,7 +640,7 @@
 					alert("피신청인 사업자 등록번호를 입력해 주세요.");
 					return false;
 					
-				}*/
+				}
 				
 			}
 			
@@ -652,7 +655,7 @@
 			var rppl04RealPost = $('#rppl04RealPost').val();
 			var rppl04RealAddrDtl = $('#rppl04RealAddrDtl').val();
 			
-			/*if(rppl04Post == ""){
+			if(rppl04Post == ""){
 				
 				alert("피신청인 주소 우편번호를 입력해 주세요.");
 				return false;
@@ -666,40 +669,40 @@
 				
 			}
 			
-			if(rppl04Email1 == ""){
+//			if(rppl04Email1 == ""){
+//				
+//				alert("피신청인 이메일을 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-				alert("피신청인 이메일을 입력해 주세요.");
+//			if(rppl04Email2 == ""){
-				return false;
+//				
+//				alert("피신청인 이메일 도메인 정보를 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-			}
+//			if(rppl04Phone1 == ""){
+//				
+//				alert("피신청인 연락처 정보를 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-			if(rppl04Email2 == ""){
+//			if(rppl04Phone2 == ""){
+//				
+//				alert("피신청인 연락처 정보를 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-				alert("피신청인 이메일 도메인 정보를 입력해 주세요.");
+//			if(rppl04Phone3 == ""){
-				return false;
+//				
-				
+//				alert("피신청인 연락처 정보를 입력해 주세요.");
-			}
+//				return false;
-			
+//				
-			if(rppl04Phone1 == ""){
+//			}
-				
-				alert("피신청인 연락처 정보를 입력해 주세요.");
-				return false;
-				
-			}
-			
-			if(rppl04Phone2 == ""){
-				
-				alert("피신청인 연락처 정보를 입력해 주세요.");
-				return false;
-				
-			}
-			
-			if(rppl04Phone3 == ""){
-				
-				alert("피신청인 연락처 정보를 입력해 주세요.");
-				return false;
-				
-			}
 			
 			if(rppl04RealPost == ""){
 				
@@ -714,7 +717,7 @@
 				return false;
 				
 			}
-			*/
+			
 			//신청인 이메일정보 합쳐주기
 			var rppl04Email1 = $('#rppl04Email1').val();
 			var rppl04Email2 = $('#rppl04Email2').val();
@@ -740,19 +743,19 @@
 				
 				var rppl0501Nm = $('#rppl0501Nm').val();
 				
-				/*if(rppl0501Nm == ""){
+				if(rppl0501Nm == ""){
 					
 					alert("피신청인 이름을 입력해 주세요.");
 					return false;
 					
-				}*/
+				}
 		 		
 			}else if(rppl05UsrTy == "02"){ // 법인일 경우
 				
 				var rppl0502Nm = $('#rppl0502Nm').val();
 				var rppl05BizNm = $('#rppl05BizNm').val();
 				var rppl05BizId = $('#rppl05BizId').val();
-				/*
+				
 				if(rppl0502Nm == ""){
 					
 					alert("피신청인 대표자 이름을 입력해 주세요.");
@@ -772,13 +775,13 @@
 					alert("피신청인 법인등록번호를 입력해 주세요.");
 					return false;
 					
-				}*/
+				}
 				
 			}else { // 개인 사업자인 경우 
 				
 				var rppl0503Nm = $('#rppl0503Nm').val();
 				var rppl05BizNo = $('#rppl05BizNo').val();
-			/*	
+				
 				if(rppl0503Nm == ""){
 					
 					alert("피신청인 개인 사업자 이름을 입력해 주세요.");
@@ -791,7 +794,7 @@
 					alert("피신청인 사업자 등록번호를 입력해 주세요.");
 					return false;
 					
-				}*/
+				}
 				
 			}
 			
@@ -805,7 +808,7 @@
 			var rppl05Phone3 = $('#rppl05Phone3').val();
 			var rppl05RealPost = $('#rppl05RealPost').val();
 			var rppl05RealAddrDtl = $('#rppl05RealAddrDtl').val();
-			/*
+			
 			if(rppl05Post == ""){
 				
 				alert("피신청인 주소 우편번호를 입력해 주세요.");
@@ -820,40 +823,40 @@
 				
 			}
 			
-			if(rppl05Email1 == ""){
+//			if(rppl05Email1 == ""){
+//				
+//				alert("피신청인 이메일을 입력해 주세요.");
+//				return false;
+//				
+//			}
 
-				alert("피신청인 이메일을 입력해 주세요.");
+//			if(rppl05Email2 == ""){
-				return false;
+//				
+//				alert("피신청인 이메일 도메인 정보를 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-			}
+//			if(rppl05Phone1 == ""){
+//				
+//				alert("피신청인 연락처 정보를 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-			if(rppl05Email2 == ""){
+//			if(rppl05Phone2 == ""){
+//				
+//				alert("피신청인 연락처 정보를 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-				alert("피신청인 이메일 도메인 정보를 입력해 주세요.");
+//			if(rppl05Phone3 == ""){
-				return false;
+//				
-				
+//				alert("피신청인 연락처 정보를 입력해 주세요.");
-			}
+//				return false;
-			
+//				
-			if(rppl05Phone1 == ""){
+//			}
-				
-				alert("피신청인 연락처 정보를 입력해 주세요.");
-				return false;
-				
-			}
-			
-			if(rppl05Phone2 == ""){
-				
-				alert("피신청인 연락처 정보를 입력해 주세요.");
-				return false;
-				
-			}
-			
-			if(rppl05Phone3 == ""){
-				
-				alert("피신청인 연락처 정보를 입력해 주세요.");
-				return false;
-				
-			}
 			
 			if(rppl05RealPost == ""){
 				
@@ -868,7 +871,7 @@
 				return false;
 				
 			}
-			*/
+			
 			//신청인 이메일정보 합쳐주기
 			var rppl05Email1 = $('#rppl05Email1').val();
 			var rppl05Email2 = $('#rppl05Email2').val();
@@ -893,12 +896,12 @@
 				
 				var rppl0601Nm = $('#rppl0601Nm').val();
 				
-				/*if(rppl0601Nm == ""){
+				if(rppl0601Nm == ""){
 					
 					alert("피신청인 이름을 입력해 주세요.");
 					return false;
 					
-				}*/
+				}
 		 		
 			}else if(rppl06UsrTy == "02"){ // 법인일 경우
 				
@@ -906,7 +909,7 @@
 				var rppl06BizNm = $('#rppl06BizNm').val();
 				var rppl06BizId = $('#rppl06BizId').val();
 				
-				/*if(rppl0602Nm == ""){
+				if(rppl0602Nm == ""){
 					
 					alert("피신청인 대표자 이름을 입력해 주세요.");
 					return false;
@@ -925,14 +928,14 @@
 					alert("피신청인 법인등록번호를 입력해 주세요.");
 					return false;
 					
-				}*/
+				}
 				
 			}else { // 개인 사업자인 경우 
 				
 				var rppl0603Nm = $('#rppl0603Nm').val();
 				var rppl06BizNo = $('#rppl06BizNo').val();
 				
-				/*if(rppl0603Nm == ""){
+				if(rppl0603Nm == ""){
 					
 					alert("피신청인 개인 사업자 이름을 입력해 주세요.");
 					return false;
@@ -944,7 +947,7 @@
 					alert("피신청인 사업자 등록번호를 입력해 주세요.");
 					return false;
 					
-				}*/
+				}
 				
 			}
 			
@@ -959,7 +962,7 @@
 			var rppl06RealPost = $('#rppl06RealPost').val();
 			var rppl06RealAddrDtl = $('#rppl06RealAddrDtl').val();
 			
-			/*if(rppl06Post == ""){
+			if(rppl06Post == ""){
 				
 				alert("피신청인 주소 우편번호를 입력해 주세요.");
 				return false;
@@ -973,40 +976,40 @@
 				
 			}
 			
-			if(rppl06Email1 == ""){
+//			if(rppl06Email1 == ""){
+//				
+//				alert("피신청인 이메일을 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-				alert("피신청인 이메일을 입력해 주세요.");
+//			if(rppl06Email2 == ""){
-				return false;
+//				
+//				alert("피신청인 이메일 도메인 정보를 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-			}
+//			if(rppl06Phone1 == ""){
+//				
+//				alert("피신청인 연락처 정보를 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-			if(rppl06Email2 == ""){
+//			if(rppl06Phone2 == ""){
+//				
+//				alert("피신청인 연락처 정보를 입력해 주세요.");
+//				return false;
+//				
+//			}
 			
-				alert("피신청인 이메일 도메인 정보를 입력해 주세요.");
+//			if(rppl06Phone3 == ""){
-				return false;
+//				
-				
+//				alert("피신청인 연락처 정보를 입력해 주세요.");
-			}
+//				return false;
-			
+//				
-			if(rppl06Phone1 == ""){
+//			}
-				
-				alert("피신청인 연락처 정보를 입력해 주세요.");
-				return false;
-				
-			}
-			
-			if(rppl06Phone2 == ""){
-				
-				alert("피신청인 연락처 정보를 입력해 주세요.");
-				return false;
-				
-			}
-			
-			if(rppl06Phone3 == ""){
-				
-				alert("피신청인 연락처 정보를 입력해 주세요.");
-				return false;
-				
-			}
 			
 			if(rppl06RealPost == ""){
 				
@@ -1020,7 +1023,7 @@
 				alert("피신청인 우편물 수령지 상세주소 정보를 입력해 주세요.");
 				return false;
 				
-			}*/
+			}
 			
 			//신청인 이메일정보 합쳐주기
 			var rppl06Email1 = $('#rppl06Email1').val();
@@ -1040,7 +1043,7 @@
 		var reqCn1 = $('#reqCn1').val();
 		var reqCn2 = $('#reqCn2').val();
 		//var fileTemp = $('.item_ uploaded_obj').length;
-		/*
+		
 		if(reqCn1 == ""){
 			
 			alert("신청취지를 입력해 주세요.");
@@ -1080,7 +1083,7 @@
 		if($('#assPstUsrNm') == ""){
 			alert("조정부를 입력해 주세요");
 			return false;
-		}*/
+		}
 		
 		var msg = "";
 		var url = "";
@@ -1102,10 +1105,6 @@
 			//신청인 정보 입력
 			var data = new FormData(form);
 
-			//임시
-			$('#nextGoPageForm').submit();
-
-			/*
 			$.ajax({
 		        type: "POST",
 		        url: url,
@@ -1129,7 +1128,6 @@
 				},
 		        error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); }
 		    });
-			*/
 		}
 		
 	}

src/main/webapp/kccadrPb/adm/css/content.css

@@ -146,9 +146,9 @@ p+.list_util{width: auto;}
 
 .btn_layout05 {position:relative;width:100%;margin:0 0 15px;}
 .btn_layout05:after {content:'';display:block;clear:both;}
-.btn_layout05 .btn_left_box {float:left;width:calc(100% - 100px);}
+.btn_layout05 .btn_left_box {float:left;width:calc(100% - 200px);}
 .btn_layout05 .btn_left_box .btnType02 {float:left;margin:0 5px 5px 0;}
-.btn_layout05 .btn_right_box {float:right;width:100px;}
+.btn_layout05 .btn_right_box {float:right;width:200px;}
 
 /* 버튼 타입 */
 .btnType01{height: 36px; padding: 0 11px; font-size: 15px; font-weight: 400; background-color: #fffaf5; color: #ea5404; border: 1px solid #ea5404; border-radius: 5px; transition: all 0.1s linear;}

src/main/webapp/kccadrPb/usr/css/content.css

@@ -451,11 +451,13 @@ table .label{position: absolute;width: 1px; height: 1px; margin: 0; border: none
 .step_wrap .step i.next{position: absolute; right: -14px; top: 52%; transform: translateY(-50%); width: 24px; height: 24px; background-color: #fff; border: 1px solid #d5d5d5; z-index: 1; color: transparent; background-image: url(/kccadrPb/usr/image/icon_step_next.png); background-repeat: no-repeat; background-position: 59% center; margin-right: 0;}
 .step_wrap .step:last-child .next{display: none;}
 
-.exp_date{display: inline-block; padding: 15px 50px; border-radius: 5px; border: 3px solid #2353b5; background-color: #f3f6fb; margin-bottom: 30px;}
+.exp_date{display: inline-block; padding: 15px 50px; border-radius: 5px; border: 3px solid #2353b5; background-color: #f3f6fb; margin-bottom: 30px;margin-right:4px;}
 .exp_date i{display: inline-block; vertical-align: middle; width: 21px; height: 21px; background-image: url(/kccadrPb/usr/image/icon_exp_date.png); margin-right: 12px;}
 .exp_date p{display: inline-block; vertical-align: middle; font-size: 20px; font-weight: 300;}
 .exp_date span{font-weight: bold;}
 
+.exp_select {width: 150px; height: 46px; border: 1px solid #d5d5d5; border-radius: 5px; padding-left: 14px; font-size: 16px; color: #222; background-image: url(/kccadrPb/usr/image/icon_cont_select.png); background-repeat: no-repeat; background-position: calc(100% - 15px) center; margin-right: 3px; color: #555;vetical-align:middle;margin-right:4px;}
+
 .change_text_wrap{height: auto; min-height: 48px;}
 .change_text_wrap.close{height: 48px; overflow: hidden;}
 .btn_all{width: 100%; height: 40px; margin-top: 20px; margin-bottom: 10px; border-radius: 5px; font-size: 16px; font-weight: 400; background-color: #f5f5f5; border: 1px solid #aeaeae; color: #555; background-image: url(/kccadrPb/usr/image/btn_all.png); background-repeat: no-repeat; background-position: calc(50% + 40px); transition: background-color .15s linear;}