diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java index 56403dea..f079944d 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java @@ -183,8 +183,15 @@ public class ExprnClsrmAplctController { HttpSession session = request.getSession(); session.setAttribute("beforeSiteUrl", request.getRequestURI()); + //a + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + //신청서 양식다운로드 정보 가져오기(신청일자 기준 가장 최신 데이터, 1개 로우) VEPrcsDetailVO detailVO = new VEPrcsDetailVO(); + + //체험교실 운영신청이 있는지 확인 한다. + if (loginVO!=null) detailVO.setUserId(loginVO.getUniqId()); + detailVO.setLctrDivCd("30"); //저작권 체험교실 구분 값 detailVO = vEPrcsAplctPrdService.selectDetailNewOne(detailVO); model.addAttribute("detailVO", detailVO); diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index 9e81a82f..d3675624 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -549,7 +549,16 @@ a.dprtm_nm AS dprtmNm , a.cn_atch_file_id AS cnAtchFileId, a.oprtn_atch_file_id AS oprtnAtchFileId + , b.edu_aplct_ord AS eduAplctOrd FROM ve_prcs_aplct_prd a + LEFT OUTER JOIN ( + SELECT * + FROM ve_edu_aplct a0 + WHERE 1=1 + AND a0.LCTR_DIV_CD =#lctrDivCd# + AND a0.user_id =#userId# + )b + on(a.prcs_ord=b.prcs_ord) WHERE 1 = 1 AND a.lctr_div_cd=#lctrDivCd# diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp index 7c60908c..9125d42b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp @@ -26,6 +26,12 @@ alert("신청기간이 아닙니다."); return false; } + + if(${detailVO.eduAplctOrd != null}){ + alert("신청한 내역이 있습니다."); + return false; + } + commonPopLayeropen( "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/cautionGuide.do" , 730 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp index e22eaad2..06e5c8e9 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp @@ -278,7 +278,7 @@
- +