Merge branch 'advc' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/offedu into advc

pom.xml

@@ -69,12 +69,6 @@
 	</repositories>
 
 	<dependencies>
-		<!-- https://mvnrepository.com/artifact/com.thetransactioncompany/cors-filter -->
-		<dependency>
-			<groupId>com.thetransactioncompany</groupId>
-			<artifactId>cors-filter</artifactId>
-			<version>2.6</version>
-		</dependency>
 		<dependency>
 			<groupId>egovframework.rte</groupId>
 			<artifactId>egovframework.rte.fdl.security</artifactId>

src/main/java/kcc/let/uat/uia/web/APILoginContoller.java

@@ -46,7 +46,6 @@ import kcc.let.utl.sim.service.EgovClntInfo;
  */
 
 @Controller
-@CrossOrigin(origins = "*", methods = RequestMethod.POST) 
 public class APILoginContoller {
 
 	/** userManageService */
@@ -67,9 +66,9 @@ public class APILoginContoller {
 	 * @throws Exception
 	*/
 	@RequestMapping(value = "/web/chkloginKeyForOffedu.do")
-	public String loginKeyChkForOffedu(@RequestBody Map<String, String> paramRequest, RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response,HttpSession session) throws Exception {
+	public String loginKeyChkForOffedu(RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response,HttpSession session) throws Exception {
-		String userId = paramRequest.get("user_id");
+		String userId = request.getParameter("user_id");
-		String key = paramRequest.get("key");
+		String key = request.getParameter("key");
 		//String returnUrl = paramRequest.get("returnUrl"); //e-배움터 문의결과 returnUrl 컨트롤은 불가능하다고 함
 		String returnUrl = "";
 		

src/main/java/kcc/let/uat/uia/web/SimpleCORSFilter.java

@@ -0,0 +1,47 @@
+package kcc.let.uat.uia.web;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * e-배움터와 연동하여 로그인을 처리하는 컨트롤러 클래스
+ *
+ * @author 이지우
+ * @since 2023.08.31
+ * @version 1.0
+ * @see
+ */
+
+@Component
+public class SimpleCORSFilter implements Filter {
+
+	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+	throws IOException, ServletException {
+	
+	HttpServletResponse response = (HttpServletResponse) res;
+	
+	response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+	response.setHeader("Access-Control-Max-Age", "3600");
+	response.setHeader("Access-Control-Allow-Headers", "Content-Type, Accept, X-Requested-With, remember-me");
+	
+	response.setHeader("Access-Control-Allow-Origin", "*");
+	//response.setHeader("Access-Control-Allow-Origin", "http://services.arcgisonline.com");
+	chain.doFilter(req, res);
+	}
+	
+	public void init(FilterConfig filterConfig) {
+	}
+	
+	public void destroy() {
+	}
+
+}

src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java

@@ -146,6 +146,14 @@ public class FndtnEnhanceTrnController {
 	private FndtnEnhanceTrnService fndtnEnhanceTrnService;
 
 
+	/**
+	 * 대시보드 임시
+	 */
+	@RequestMapping("/web/ve/aplct/fndtnEnhanceTrn/main_2.do")
+	public String main_2( @ModelAttribute("vEEduAplctVO") VEPrcsDetailVO vEPrcsDetailVO , ModelMap model , HttpServletRequest request ) throws Exception {
+
+    	return "/web/ve/aplct/fndtnEnhanceTrn/main_2";
+	}
 	/**
 	 * 교육신청 목록 화면
 	 */

src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java

@@ -153,6 +153,15 @@ public class SspnIdtmtController {
 	private SspnIdtmtService sspnIdtmtService;
 
 
+	/**
+	 * 대시보드 임시
+	 */
+	@RequestMapping("/web/ve/aplct/sspnIdtmt/main_2.do")
+	public String main_2( @ModelAttribute("vEEduAplctVO") VEPrcsDetailVO vEPrcsDetailVO , ModelMap model , HttpServletRequest request ) throws Exception {
+
+    	return "/web/ve/aplct/sspnIdtmt/main_2";
+	}
+	
 	/**
 	 * 교육신청 목록 화면
 	 */

src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java

@@ -45,4 +45,6 @@ public interface VEPrcsAplctPrdService {
 	
 	VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception;
 
+	void updateOneColumn(VEPrcsDetailVO vEPrcsDetailVO) throws Exception;
+
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java

@@ -103,4 +103,9 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService {
 	public VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception {
 		return vEPrcsAplctPrdDAO.selectDetailByOrd(vEPrcsDetailVO);
 	}
+
+	public void updateOneColumn(VEPrcsDetailVO vEPrcsDetailVO) throws Exception {
+		vEPrcsAplctPrdDAO.update(vEPrcsDetailVO);
+	}
+
 }

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java

@@ -672,6 +672,54 @@ public class CndtnPrcsInfoMngController {
 		return "/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail";
 	}
 	
+
+	/**
+	 * ve_prcs_aplct_prd 테이블에 데이터 하나만 변경하는 기능
+	 */
+	@RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/updateDdlnCdAjax.do")
+	public ModelAndView updateDdlnCdAjax(
+			@ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO
+			, ModelMap model
+			//, RedirectAttributes redirectAttributes    
+			, HttpServletRequest request
+			) throws Exception {
+		
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+		
+		//로그인 처리====================================
+		//로그인 정보 가져오기
+		
+		String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model);
+		if (!"".equals(s_oprtnLoginCheckNInfo))	{
+			modelAndView.addObject("result", "loginFail");
+			return modelAndView;		
+		}
+		
+		//로그인 처리==================================== 
+		
+		
+		LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
+		SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request);	//SSO 로그인 정보 가져오기
+		
+		
+		//String prcsAplctPrdOrd = prcsAplctPrdGnrService.getNextStringId(); // 고유ID 
+		//vEPrcsDetailVO.setPrcsAplctPrdOrd(prcsAplctPrdOrd);
+		vEPrcsDetailVO.setLctrDivCd("60");	//강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부
+		vEPrcsDetailVO.setLastUpdusrId(loginVO.getUniqId());	//강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부
+		//vEPrcsDetailVO.setUseYn("Y");
+		vEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId());	//esntl_id    	
+		
+		vEPrcsAplctPrdService.updateOneColumn(vEPrcsDetailVO);
+		
+		
+		modelAndView.addObject("result", "success");
+		
+		return modelAndView;
+		
+	}	
+	
+	
 	/**
 	 * 조건부기소유예 기간 상세화면
 	 */

src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java

@@ -716,6 +716,52 @@ public class FndthPrcsAplctPrdMngController {
 
     }	
 	
+	/**
+	 * ve_prcs_aplct_prd 테이블에 데이터 하나만 변경하는 기능
+	 */
+	@RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/updateDdlnCdAjax.do")
+	public ModelAndView updateDdlnCdAjax(
+			@ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO
+			, ModelMap model
+			//, RedirectAttributes redirectAttributes    
+			, HttpServletRequest request
+			) throws Exception {
+		
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+		
+		//로그인 처리====================================
+		//로그인 정보 가져오기
+		
+		String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model);
+		if (!"".equals(s_oprtnLoginCheckNInfo))	{
+			modelAndView.addObject("result", "loginFail");
+			return modelAndView;		
+		}
+		
+		//로그인 처리==================================== 
+		
+		
+		LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
+		SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request);	//SSO 로그인 정보 가져오기
+		
+		
+		//String prcsAplctPrdOrd = prcsAplctPrdGnrService.getNextStringId(); // 고유ID 
+		//vEPrcsDetailVO.setPrcsAplctPrdOrd(prcsAplctPrdOrd);
+		vEPrcsDetailVO.setLctrDivCd("50");	//강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부
+		vEPrcsDetailVO.setLastUpdusrId(loginVO.getUniqId());	//강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부
+		//vEPrcsDetailVO.setUseYn("Y");
+		vEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId());	//esntl_id    	
+		
+		vEPrcsAplctPrdService.updateOneColumn(vEPrcsDetailVO);
+		
+		
+		modelAndView.addObject("result", "success");
+		
+		return modelAndView;
+		
+	}	
+	
 	
 	
 

src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml

@@ -1168,10 +1168,5 @@
 		WHERE USER_ID = #userId#
 		AND LCTR_DIV_CD = '30'
 		AND APRVL_CD = '60'
-		AND PRCS_ORD = (SELECT
-							MAX(PRCS_APLCT_PRD_ORD)
-						FROM VE_PRCS_APLCT_PRD
-						WHERE LCTR_DIV_CD = '30'
-						AND USE_YN = 'Y')	
 	</select>
 </sqlMap>

src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.jsp

@@ -280,13 +280,12 @@
 									<kc:code codeId="VEA004" code="${list.ddlnCd}"/>
 								</td>
 								<td>									
-<%-- 									<c:out value="${list.strtPnttm}"/>~<c:out value="${list.endPnttm}"/> --%>
 									<c:choose>
-										<c:when test="${list.instrCnt ne 0 }">
+										<c:when test="${list.instrCnt eq 0 or list.instrCnt eq null}">
-											배정완료
+											<button type="button" class="btn_type04" onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');">강사배정</button>
 										</c:when>
 										<c:otherwise>
-											<button type="button" class="btn_type04" onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');">강사배정</button>
+											배정완료
 										</c:otherwise>
 									</c:choose>
 								</td>

src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp

@@ -189,10 +189,45 @@
         
     }
 	
+
+
+	function fncDdlnCdSave(data){
+		$('#modyDdlnCd').val(data);
+
+		var data = new FormData(document.getElementById("modyfiForm"));
+			if(confirm("상태를 변경하시겠습니까?")){
+				var url = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/updateDdlnCdAjax.do'/>";
+				console.log(data);
+				$.ajax({
+					type:"POST",
+					url: url,
+					data: data,
+					dataType:'json',
+					async: false,
+					processData: false,
+					contentType: false,
+					cache: false,
+					success:function(returnData){
+							if(returnData.result == "success"){
+							alert("변경되었습니다.");
+							location.reload();
+						}
+					},
+					error:function(request , status, error){
+						alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+					}
+				});
+			}
+	}
+    
 </script>
 
 </head>
 <body>
+<form id="modyfiForm" name="modyfiForm">
+	<input type="hidden" id="modyDdlnCd" name="ddlnCd" />
+	<input type="hidden" name="prcsAplctPrdOrd" id="prcsAplctPrdOrd" value="<c:out value='${vEPrcsDetailVO.prcsAplctPrdOrd}' />"/>
+</form>
 <form id="instrForm" name="instrForm" method="post">
 	<input type="hidden" name="prcsAplctPrdOrd" id="prcsAplctPrdOrd" value="<c:out value='${vEPrcsDetailVO.prcsAplctPrdOrd}' />"/>
 	<input type="hidden" name="userId" id="userId"/>
@@ -485,6 +520,8 @@
 			<!-- btn_wrap -->
 			<div class="btn_wrap btn_layout01">
 				<div class="btn_left">
+					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(10); return false;">신청마감</button>
+					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(20); return false;">교육확정</button>
 				</div>
 				<div class="btn_center">
 				</div>

src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp

@@ -282,11 +282,11 @@
 								<td>									
 <%-- 									<c:out value="${list.strtPnttm}"/>~<c:out value="${list.endPnttm}"/> --%>
 									<c:choose>
-										<c:when test="${list.instrCnt ne 0 }">
+										<c:when test="${list.instrCnt eq 0 or list.instrCnt eq null}">
-											배정완료
+											<button type="button" class="btn_type04" onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');">강사배정</button>
 										</c:when>
 										<c:otherwise>
-											<button type="button" class="btn_type04" onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');">강사배정</button>
+											배정완료
 										</c:otherwise>
 									</c:choose>
 								</td>

src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp

@@ -187,10 +187,45 @@
         
     }
 	
+    
+
+	function fncDdlnCdSave(data){
+		$('#modyDdlnCd').val(data);
+
+		var data = new FormData(document.getElementById("modyfiForm"));
+			if(confirm("상태를 변경하시겠습니까?")){
+				var url = "<c:url value='/kccadr/oprtn/fndthEnhanceTrn/updateDdlnCdAjax.do'/>";
+				console.log(data);
+				$.ajax({
+					type:"POST",
+					url: url,
+					data: data,
+					dataType:'json',
+					async: false,
+					processData: false,
+					contentType: false,
+					cache: false,
+					success:function(returnData){
+							if(returnData.result == "success"){
+							alert("변경되었습니다.");
+							location.reload();
+						}
+					},
+					error:function(request , status, error){
+						alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+					}
+				});
+			}
+	}
+    
 </script>
 
 </head>
 <body>
+<form id="modyfiForm" name="modyfiForm">
+	<input type="hidden" id="modyDdlnCd" name="ddlnCd" />
+	<input type="hidden" name="prcsAplctPrdOrd" id="prcsAplctPrdOrd" value="<c:out value='${vEPrcsDetailVO.prcsAplctPrdOrd}' />"/>
+</form>
 <form id="instrForm" name="instrForm" method="post">
 	<input type="hidden" name="prcsAplctPrdOrd" id="prcsAplctPrdOrd" value="<c:out value='${vEPrcsDetailVO.prcsAplctPrdOrd}' />"/>
 	<input type="hidden" name="userId" id="userId"/>
@@ -486,6 +521,8 @@
 			<!-- btn_wrap -->
 			<div class="btn_wrap btn_layout01">
 				<div class="btn_left">
+					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(10); return false;">신청마감</button>
+					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(20); return false;">교육확정</button>
 				</div>
 				<div class="btn_center">
 				</div>

src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp

@@ -169,6 +169,8 @@
 			
 		}
 
+
+		
 	</script>
 	<title>과정신청기간관리목록</title>
 </head>

src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp

@@ -179,18 +179,18 @@
 		
 		<!-- cont_tit -->
 		<div class="cont_tit">
-				<h2>교육 과정 수정</h2>
+			<h2>과정신청기간관리 수정</h2>
 			<ul class="cont_nav">
 				<li class="home"><a href="/"><i></i></a></li>
 				<li>
-						<p>교육콘텐츠</p>
+					<p>기반강화연수관리</p>
 				</li>
-					<li><span class="cur_nav">교육 과정 관리</span></li>
+				<li><span class="cur_nav">과정신청기간관리목록</span></li>
-					<li><span class="cur_nav">교육 과정 수정</span></li>
 			</ul>
 		</div>
 		<!-- //cont_tit -->
 			
+
 		<div class="cont">
 			<!-- list_상세 -->
 			<div class="tb_tit01">

src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp

@@ -60,6 +60,8 @@ $(document).ready(function (){
 		if("${instrDiv}" == 'tngrInstrDiv'){
 			$("#9991000").parent('li').hide();	
 			$("#full_9991000").parent('li').hide();	
+			$("#99912000").parent('li').hide();	
+			$("#full_99912000").parent('li').hide();	
 		}else if("${instrDiv}" == 'adultInstrDiv'){
 			$("#99923000").parent('li').hide();
 			$("#full_99923000").parent('li').hide();

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp

@@ -264,18 +264,20 @@
 
 	<div class="btn_wrap btn_layout01">
 		<div class="btn_left">
+			<button type="button" class="btnType05" onclick="location.href='<c:url value="/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.do"/>'">운영 목록으로 이동</button>
 		</div>
 		<div class="btn_center">
-		</div>
-		<div class="btn_right">
 			<c:if test="${info.aprvlCd eq VeConstants.STATUS_CD_EDT_REQ or info.sbmtYn ne 'Y'}">
-				<button type="button" class="btnType06" onclick="fncGoEdit();">수정</button>
+				<button type="button" class="btnType05" onclick="fncGoEdit();">수정</button>
 			</c:if>
 			<!-- 23.07031 - 신청기간 내 수정 기능 추가 - 요청중일때만 수정 가능 -->
 			<c:if test="${info.aprvlCd eq VeConstants.STATUS_CD_SBMT and cnt > 0}">
 				<button type="button" class="btnType06" onclick="fncGoEdit();">수정</button>
 			</c:if>
 		</div>
+		<div class="btn_right">
+			<button type="button" class="btnType05" onclick="nextTab('2');">운영계획으로 이동</button>
+		</div>
 	</div>
 </div>
 

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp

@@ -49,6 +49,11 @@
 			});
 		}
 	}
+	
+	function nextTab(tab){
+		window.scrollTo(0,0);
+		$('.p_'+tab).children('a').click();
+	}
 </script>
 
 <form id="loadForm" name="loadForm" method="post">

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp

@@ -119,10 +119,12 @@
 		</div>
 	<div class="btn_wrap btn_layout01">
 		<div class="btn_left">
+			<button type="button" class="btnType05" onclick="location.href='<c:url value="/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.do"/>'">운영 목록으로 이동</button>
 		</div>
 		<div class="btn_center">
 		</div>
 		<div class="btn_right">
+			<button type="button" class="btnType05" onclick="nextTab('4');">결과보고로 이동</button>
 		</div>
 	</div>
 </div>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp

@@ -167,10 +167,9 @@
 
 	<div class="btn_wrap btn_layout01">
 		<div class="btn_left">
+			<button type="button" class="btnType05" onclick="location.href='<c:url value="/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.do"/>'">운영 목록으로 이동</button>
 		</div>
 		<div class="btn_center">
-		</div>
-		<div class="btn_right">
 			<c:if test="${info.aprvlCd eq VeConstants.STATUS_CD_EDT_REQ or info.sbmtYn ne 'Y'}">
 				<button type="button" class="btnType06" onclick="fncGoEdit();">수정</button>
 			</c:if>
@@ -179,6 +178,9 @@
 				<button type="button" class="btnType06" onclick="fncGoEdit();">수정</button>
 			</c:if>
 		</div>
+		<div class="btn_right">
+			<button type="button" class="btnType05" onclick="nextTab('3');">서류 제출로 이동</button>
+		</div>
 	</div>
 </div>
 

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard.jsp

@@ -594,17 +594,24 @@
 				</dd>
 			</dl>
 		</div>
-	
+	</c:if>
 		<div class="btn_wrap btn_layout01">
-			<div class="btn_left"></div>
+			<div class="btn_left">
+				<button type="button" class="btnType05" onclick="location.href='<c:url value="/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.do"/>'">운영 목록으로 이동</button>
+			</div>
 			<div class="btn_center">
+				<c:if test="${info.exprnAprvlCd != '10'}">
 					<button type="button" class="btnType06" onclick="fncSave();">결과제출</button>
 					<button type="button" class="btnType06" onclick="fncTmprrSave();">임시저장</button>
+				</c:if>
 			</div>
 			<div class="btn_right">
+				<c:if test="${info.exprnAprvlCd != '10'}">
 					<div id="fileControl5" style="display:none"></div>
-			</div>
-		</div>
 				</c:if>
+				<button type="button" class="btnType05" onclick="nextTab('5');">최종결과로 이동</button>
+			</div>
+		</div>
+	
 </div>
 

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp

@@ -700,6 +700,7 @@
 	</c:if>
 	<div class="btn_wrap btn_layout01">
 		<div class="btn_left">
+			<button type="button" class="btnType05" onclick="location.href='<c:url value="/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.do"/>'">운영 목록으로 이동</button>
 		</div>
 		<div class="btn_center">
 			<button type="button" class="btnType04" onclick="fncGoLctrAplctReg();">교육콘텐츠 신청</button>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main_2.jsp

@@ -0,0 +1,248 @@
+<%@ 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="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%@ 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="VeConstants" className="kcc.ve.cmm.VeConstants" />
+<title>교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템</title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<script type="text/javaScript" language="javascript">
+	function linkPage(pageNo){
+		var listForm = document.listForm ;
+		listForm.pageIndex.value = pageNo ;
+		listForm.action = "<c:url value='/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctList.do'/>";
+		listForm.submit();
+	}
+
+	function goWrite(){
+		$("#listForm").attr("action","${pageContext.request.contextPath}/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.do").submit();
+	}
+
+	function fncGoDetail(eduAplctOrd){
+		var listForm = document.listForm ;
+		listForm.eduAplctOrd.value = eduAplctOrd ;
+		$("#listForm").attr("action","${pageContext.request.contextPath}/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.do").submit();
+	}
+
+	function fncGoList(){
+		linkPage(1);
+	}
+
+	function fncReset(thisObj){
+		var targetObj = $(thisObj).closest('.list_top').find('select,input');
+		$.each(targetObj, function(){
+			$(this).val('');
+		});
+	}
+</script>
+
+<!-- content -->
+			<!-- <div class="snb">
+				<h2>찾아가는 저작권 교육<span>청소년</span></h2>
+				<div class="ssleftxt">
+					<ul>
+						<li><a href="#none">교육신청 방법</a></li>
+						<li><a href="#none">교육일정 안내</a></li>
+						<li class="menu_on"><a href="#none">교육신청</a></li>
+						<li><a href="#none">교육신청 조회</a></li>
+					</ul>
+				</div>
+			</div> -->
+			<div class="cont_wrap">
+				<div class="cont_tit">
+					<h2>교육기반강화연수</h2>
+					<div class="sns_go">
+						<button type="button" title="새창열림"><img
+								src="/offeduadvc/visitEdu/usr/publish/images/content/facebook_icon.png" alt="페이스북 바로가기"><a href="https://www.facebook.com/koreacopyright" target="_blank"></a></button>
+					</div>
+				</div>
+
+                <div class="tb_tit02">
+					<div class="tb_tit02_left">
+						<div class="t_best">베스트</div>
+					</div>
+					<div class="btn_wrap1">
+						<button type="button" title="베스트 더보기" class="con_more" onclick="location.href=''">더보기</button>
+					</div>
+				</div>
+
+                <div class="best_list">
+                    <div class="best_con">
+                        <div class="img"><img src="/offeduadvc/visitEdu/usr/publish/images/content/popup_img_imsi.jpg" alt="핵심인재 역량강화"></div>
+                        <ul>
+                            <li class="con_title">핵심인재 역량강화 핵심인재 역량강화</li>
+                            <li class="con_date">2023-09-24 ~ 2023-09-30</li>
+                            <li class="con_btn"><button type="button" title="수강신청">수강신청</button></li>
+                        </ul>
+                    </div>
+                    <div class="best_con">
+                        <div class="img"><img src="https://www.copyright.or.kr/images/renewal/facebook_thumbnail.jpg" alt="핵심인재 역량강화"></div>
+                        <ul>
+                            <li class="con_title">핵심인재 역량강화</li>
+                            <li class="con_date">2023-09-24 ~ 2023-09-30</li>
+                            <li class="con_btn"><button type="button" title="수강신청">수강신청</button></li>
+                        </ul>
+                    </div>
+                    <div class="best_con">
+                        <div class="img"><img src="https://www.copyright.or.kr/images/renewal/facebook_thumbnail.jpg" alt="핵심인재 역량강화"></div>
+                        <ul>
+                            <li class="con_title">핵심인재 역량강화</li>
+                            <li class="con_date">2023-09-24 ~ 2023-09-30</li>
+                            <li class="con_btn"><button type="button" title="수강신청">수강신청</button></li>
+                        </ul>
+                    </div>
+                    <div class="best_con">
+                        <div class="img"><img src="https://www.copyright.or.kr/images/renewal/facebook_thumbnail.jpg" alt="핵심인재 역량강화"></div>
+                        <ul>
+                            <li class="con_title">핵심인재 역량강화</li>
+                            <li class="con_date">2023-09-24 ~ 2023-09-30</li>
+                            <li class="con_btn"><button type="button" title="수강신청">수강신청</button></li>
+                        </ul>
+                    </div>
+                </div>
+
+
+                <div class="tb_tit02">
+					<div class="tb_tit02_left">
+						<div class="t_edu">교육과정</div>
+					</div>
+				</div>
+
+
+                <div class="list_top">
+					<div class="list_top_left">
+						<label for="" class="label">교육과정 선택</label>
+						<select class="selType1">
+							<option for="">전체</option>
+							<option for="">지난교육일정</option>
+							<option for="">당월교육일정</option>
+							<option for="">교육예정일정</option>
+						</select>
+					</div>
+                    <div class="btn_wrap">
+                        <div class="calendar_wrap">
+                            <duet-date-picker identifier="date" name="searchStartDt" class="startDate hydrated" value=""></duet-date-picker>
+                        </div>
+                        ~
+                        <div class="calendar_wrap">
+                            <duet-date-picker identifier="date" name="searchEndDt" class="endDate hydrated" value=""></duet-date-picker>
+                        </div>
+						<script src="/offeduadvc/visitEdu/usr/publish/script/duetdatepicker.js"></script>
+						<button type="button" class="btnType01">검색</button>						
+                    </div>
+                </div>
+
+                <div class="edup_result">
+                    <div>총 <span>6</span>개의 검색결과가 있습니다.</div>
+                    <ul>
+                        <li class="pass">지난교육일정</li>
+                        <li class="this">당월교육일정</li>
+                        <li class="pre">교육예정일정</li>
+                    </ul>
+                </div>
+
+                <div class="edu_program">
+                    <table>
+                        <caption>교육일정표</caption>
+						<colgroup>
+							<col style="width: ;">
+							<col style="width: ;">
+                            <col style="width: ;">
+                            <col style="width:4%;">
+                            <col style="width:4%;">
+							<col style="width:4%;">
+                            <col style="width:4%;">
+                            <col style="width:4%;">
+                            <col style="width:4%;">
+							<col style="width:4%;">
+                            <col style="width:4%;">
+                            <col style="width:4%;">
+                            <col style="width:4%;">
+							<col style="width:4%;">
+                            <col style="width:4%;">
+						</colgroup>
+                        <thead>
+                            <tr>
+                                <th class="first" rowspan="2">교육과정명<br/><span class="ep_text">(상세 내용을 보시려면 과정을 클릭하세요)</span></th>
+                                <th rowspan="2">일수</th>
+                                <th rowspan="2">시간</th>
+                                <th colspan="12">교육일정<sapn class="ep_text">(교육 시작일)</sapn></th>
+                            </tr>
+                            <tr>
+                                <th>1</th>
+                                <th>2</th>
+                                <th>3</th>
+                                <th>4</th>
+                                <th>5</th>
+                                <th>6</th>
+                                <th>7</th>
+                                <th>8</th>
+                                <th class="edup_this">9</th>
+                                <th>10</th>
+                                <th>11</th>
+                                <th>12</th>
+                            </tr>
+							</thead>
+							<tbody>
+                            <tr>
+                                <td class="edup_title"><a href="#">[경영기획] 경영기획기본</a></td>
+                                <td class="edup_days">2</td>
+                                <td class="edup_time">14</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">15,22</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">2</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">24</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">22</td>
+                                <td class="edup_this">8</td>
+                                <td class="edup_pre">14</td>
+                                <td class="edup_pre">27</td>
+                                <td class="edup_pre"></td>
+                            </tr>
+							<tr>
+                                <td class="edup_title"><a href="#">[경영기획] 경영기획기본</a></td>
+                                <td class="edup_days">2</td>
+                                <td class="edup_time">14</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">15,22</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">2</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">24</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">22</td>
+                                <td class="edup_this">8</td>
+                                <td class="edup_pre">14</td>
+                                <td class="edup_pre">27</td>
+                                <td class="edup_pre"></td>
+                            </tr>
+							<tr>
+                                <td class="edup_title"><a href="#">[경영기획] 경영기획기본</a></td>
+                                <td class="edup_days">2</td>
+                                <td class="edup_time">14</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">15,22</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">2</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">24</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">22</td>
+                                <td class="edup_this">8</td>
+                                <td class="edup_pre">14</td>
+                                <td class="edup_pre">27</td>
+                                <td class="edup_pre"></td>
+                            </tr>                            
+                        </tbody>
+                    </table>
+                </div>
+            
+
+			</div>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main_2.jsp

@@ -0,0 +1,213 @@
+<%@ 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="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%@ 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="VeConstants" className="kcc.ve.cmm.VeConstants" />
+<title>교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템</title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<script type="text/javaScript" language="javascript">
+	function linkPage(pageNo){
+		var listForm = document.listForm ;
+		listForm.pageIndex.value = pageNo ;
+		listForm.action = "<c:url value='/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctList.do'/>";
+		listForm.submit();
+	}
+
+	function goWrite(){
+		$("#listForm").attr("action","${pageContext.request.contextPath}/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.do").submit();
+	}
+
+	function fncGoDetail(eduAplctOrd){
+		var listForm = document.listForm ;
+		listForm.eduAplctOrd.value = eduAplctOrd ;
+		$("#listForm").attr("action","${pageContext.request.contextPath}/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.do").submit();
+	}
+
+	function fncGoList(){
+		linkPage(1);
+	}
+
+	function fncReset(thisObj){
+		var targetObj = $(thisObj).closest('.list_top').find('select,input');
+		$.each(targetObj, function(){
+			$(this).val('');
+		});
+	}
+</script>
+
+<!-- content -->
+			<!-- <div class="snb">
+				<h2>찾아가는 저작권 교육<span>청소년</span></h2>
+				<div class="ssleftxt">
+					<ul>
+						<li><a href="#none">교육신청 방법</a></li>
+						<li><a href="#none">교육일정 안내</a></li>
+						<li class="menu_on"><a href="#none">교육신청</a></li>
+						<li><a href="#none">교육신청 조회</a></li>
+					</ul>
+				</div>
+			</div> -->
+			<div class="cont_wrap">
+				<div class="cont_tit">
+					<h2>교육기반강화연수</h2>
+					<div class="sns_go">
+						<button type="button" title="새창열림"><img
+								src="/offeduadvc/visitEdu/usr/publish/images/content/facebook_icon.png" alt="페이스북 바로가기"><a href="https://www.facebook.com/koreacopyright" target="_blank"></a></button>
+					</div>
+				</div>
+
+               	<div class="tit_box">
+					<i class="tit_box_icon1"></i>
+					<div>
+						<p>찾아가는 저작권 교육 (내용 필요)</p>
+						<span>‘찾아가는 저작권 교육’은 저작권 교육이 필요한 <span>전국 초ㆍ중ㆍ고등학교, 청소년ㆍ아동복지ㆍ노인ㆍ장애인 기관 및 단체 등</span>에 직접 방문하여
+							무료로 강의를 지원하는 맞춤형 교육 서비스입니다.</span>
+					</div>
+				</div>
+
+
+                <div class="tb_tit02">
+					<div class="tb_tit02_left">
+						<div class="t_edu">교육과정</div>
+					</div>
+				</div>
+
+
+                <div class="list_top">
+					<div class="list_top_left">
+						<label for="" class="label">교육과정 선택</label>
+						<select class="selType1">
+							<option for="">전체</option>
+							<option for="">지난교육일정</option>
+							<option for="">당월교육일정</option>
+							<option for="">교육예정일정</option>
+						</select>
+					</div>
+                    <div class="btn_wrap">
+                        <div class="calendar_wrap">
+                            <duet-date-picker identifier="date" name="searchStartDt" class="startDate hydrated" value=""></duet-date-picker>
+                        </div>
+                        ~
+                        <div class="calendar_wrap">
+                            <duet-date-picker identifier="date" name="searchEndDt" class="endDate hydrated" value=""></duet-date-picker>
+                        </div>
+						<script src="/offeduadvc/visitEdu/usr/publish/script/duetdatepicker.js"></script>
+						<button type="button" class="btnType01">검색</button>						
+                    </div>
+                </div>
+
+                <div class="edup_result">
+                    <div>총 <span>6</span>개의 검색결과가 있습니다.</div>
+                    <ul>
+                        <li class="pass">지난교육일정</li>
+                        <li class="this">당월교육일정</li>
+                        <li class="pre">교육예정일정</li>
+                    </ul>
+                </div>
+
+                <div class="edu_program">
+                    <table>
+                        <caption>교육일정표</caption>
+						<colgroup>
+							<col style="width: ;">
+							<col style="width: ;">
+                            <col style="width: ;">
+                            <col style="width:4%;">
+                            <col style="width:4%;">
+							<col style="width:4%;">
+                            <col style="width:4%;">
+                            <col style="width:4%;">
+                            <col style="width:4%;">
+							<col style="width:4%;">
+                            <col style="width:4%;">
+                            <col style="width:4%;">
+                            <col style="width:4%;">
+							<col style="width:4%;">
+                            <col style="width:4%;">
+						</colgroup>
+                        <thead>
+                            <tr>
+                                <th class="first" rowspan="2">교육과정명<br/><span class="ep_text">(상세 내용을 보시려면 과정을 클릭하세요)</span></th>
+                                <th rowspan="2">일수</th>
+                                <th rowspan="2">시간</th>
+                                <th colspan="12">교육일정<sapn class="ep_text">(교육 시작일)</sapn></th>
+                            </tr>
+                            <tr>
+                                <th>1</th>
+                                <th>2</th>
+                                <th>3</th>
+                                <th>4</th>
+                                <th>5</th>
+                                <th>6</th>
+                                <th>7</th>
+                                <th>8</th>
+                                <th class="edup_this">9</th>
+                                <th>10</th>
+                                <th>11</th>
+                                <th>12</th>
+                            </tr>
+							</thead>
+							<tbody>
+                            <tr>
+                                <td class="edup_title"><a href="#">[경영기획] 경영기획기본</a></td>
+                                <td class="edup_days">2</td>
+                                <td class="edup_time">14</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">15,22</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">2</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">24</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">22</td>
+                                <td class="edup_this">8</td>
+                                <td class="edup_pre">14</td>
+                                <td class="edup_pre">27</td>
+                                <td class="edup_pre"></td>
+                            </tr>
+							<tr>
+                                <td class="edup_title"><a href="#">[경영기획] 경영기획기본</a></td>
+                                <td class="edup_days">2</td>
+                                <td class="edup_time">14</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">15,22</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">2</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">24</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">22</td>
+                                <td class="edup_this">8</td>
+                                <td class="edup_pre">14</td>
+                                <td class="edup_pre">27</td>
+                                <td class="edup_pre"></td>
+                            </tr>
+							<tr>
+                                <td class="edup_title"><a href="#">[경영기획] 경영기획기본</a></td>
+                                <td class="edup_days">2</td>
+                                <td class="edup_time">14</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">15,22</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">2</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">24</td>
+                                <td class="edup_pass"></td>
+                                <td class="edup_pass">22</td>
+                                <td class="edup_this">8</td>
+                                <td class="edup_pre">14</td>
+                                <td class="edup_pre">27</td>
+                                <td class="edup_pre"></td>
+                            </tr>                            
+                        </tbody>
+                    </table>
+                </div>
+            
+
+			</div>

src/main/webapp/WEB-INF/web.xml

@@ -19,73 +19,6 @@
 		<url-pattern>*.do</url-pattern>
 	</filter-mapping>
 	
-    <!-- CORS -->
-	   <filter>
-	      <filter-name>CORS</filter-name>
-	      <filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class>
-	  <init-param>
-	    <param-name>cors.allowed.origins</param-name>
-	    <param-value>*</param-value>
-	  </init-param>
-	  <init-param>
-	    <param-name>cors.allowed.methods</param-name>
-	    <param-value>GET,POST,HEAD,OPTIONS,PUT</param-value>
-	  </init-param>
-	  <init-param>
-	    <param-name>cors.allowed.headers</param-name>
-	    <param-value>Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers</param-value>
-	  </init-param>
-	  <init-param>
-	    <param-name>cors.exposed.headers</param-name>
-	    <param-value>Access-Control-Allow-Origin,Access-Control-Allow-Credentials</param-value>
-	  </init-param>
-	  <init-param>
-	    <param-name>cors.support.credentials</param-name>
-	    <param-value>false</param-value>
-	  </init-param>
-	  <init-param>
-	    <param-name>cors.preflight.maxage</param-name>
-	    <param-value>10</param-value>
-  </init-param>
-   </filter>
-   <filter-mapping>
-      <filter-name>CORS</filter-name>
-      <url-pattern>/*</url-pattern>
-   </filter-mapping>
-<filter>
-    <filter-name>CorsFilter</filter-name>
-    <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
-    <init-param>
-        <param-name>cors.allowed.origins</param-name>
-        <param-value>*</param-value>
-    </init-param>
-    <init-param>
-        <param-name>cors.allowed.methods</param-name>
-        <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
-    </init-param>
-    <init-param>
-        <param-name>cors.allowed.headers</param-name>
-        <param-value>Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers</param-value>
-    </init-param>
-    <init-param>
-        <param-name>cors.exposed.headers</param-name>
-        <param-value>Access-Control-Allow-Origin,Access-Control-Allow-Credentials</param-value>
-    </init-param>
-    <init-param>
-    	<!-- 쿠키 통신을 안하는데 이걸 true로 하면 4XX 서버 에러가 뜬다 -->
-        <param-name>cors.support.credentials</param-name>
-        <param-value>false</param-value> 
-    </init-param>
-    <init-param>
-        <param-name>cors.preflight.maxage</param-name>
-        <param-value>10</param-value>
-    </init-param>
-</filter>
-<filter-mapping>
-    <filter-name>CorsFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-</filter-mapping>
-	
 	<!-- 템플릿 소스에서는 아래의 필터사용 대신 JSP 출력시 <c:out> 태그를 사용하는 것을 기본정책으로 한다  -->
 	<!-- egovframework.rte.ptl.mvc.filter.HTMLTagFilter kcc.com.cmm.filter.HTMLTagFilter-->
     <!--
@@ -98,6 +31,15 @@
         <url-pattern>*.do</url-pattern>
     </filter-mapping>
     -->
+	<filter>
+	<filter-name>cors</filter-name>
+	<filter-class>kcc.let.uat.uia.web.SimpleCORSFilter</filter-class>
+	</filter>
+	<filter-mapping>
+	<filter-name>cors</filter-name>
+	<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
 
     <!-- security start -->
     <filter>