Merge branch 'JIWOO' into advc

src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java

@@ -331,6 +331,9 @@ public class ExprnClsrmAplctController {
     	    	
     	model.addAttribute("info", vEEduAplctVO);
 		
+    	//등록일이 과정신청기간에 포함 되는지 확인 - 신청기간에 포함되며 신청 단계의 경우 수정 기능 추가
+    	int cnt = vEEduAplctService.selectCntAplctPrd(vEEduAplctVO);
+    	model.addAttribute("cnt", cnt);
 		return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail";		
 	}	
 	

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java

@@ -41,4 +41,6 @@ public interface VEEduAplctService {
 
 	//관리번호 max값 가져오기
 	int selectMngNoMax(VEEduAplctVO veEduAplctVO) throws Exception;
+	
+	int selectCntAplctPrd(VEEduAplctVO veEduAplctVO) throws Exception;
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java

@@ -113,4 +113,8 @@ public class VEEduAplctDAO extends EgovAbstractDAO {
 		return (int) select("VEEduAplctDAO.selectTotalChasi", paramVO);
 	}
 	
+	public int selectCntAplctPrd(VEEduAplctVO veEduAplctVO) throws Exception {
+		return (int) select("VEEduAplctDAO.selectCntAplctPrd",veEduAplctVO);
+	}
+
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java

@@ -148,4 +148,9 @@ public class VEEduAplctServiceImpl implements VEEduAplctService {
 	public int selectMngNoMax(VEEduAplctVO veEduAplctVO) throws Exception {
 		return vEEduAplctDAO.selectMngNoMax(veEduAplctVO);
 	}
+	
+	@Override
+	public int selectCntAplctPrd(VEEduAplctVO veEduAplctVO) throws Exception {
+		return vEEduAplctDAO.selectCntAplctPrd(veEduAplctVO);
+	}
 }

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

@@ -988,4 +988,13 @@
 		AND
 			b.edu_hope_dt between #searchStartDt# AND #searchEndDt#
 	</select>
+	
+	<select id="VEEduAplctDAO.selectCntAplctPrd" parameterClass="VEEduAplctVO" resultClass="int">
+		SELECT
+			COUNT(a.prcs_aplct_prd_ord)
+		FROM
+			ve_prcs_aplct_prd a
+		WHERE a.USE_YN = 'Y'
+		AND REPLACE(#sbmtPnttm#, '-', '') BETWEEN SUBSTR(a.strt_pnttm,1,6) AND    SUBSTR(a.end_pnttm,1,6);
+	</select>
 </sqlMap>

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

@@ -21,7 +21,6 @@
 </style>
 <script type="text/javaScript" language="javascript">
 	$( document ).ready(function(){
-
 	});
 	function fncGoList(){
 		var listForm = document.listForm ;
@@ -494,6 +493,10 @@
 				</c:if>
 				<button type="button" class="btnType06" 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>
 			<button type="button" class="btnType02 m_btn_block" onclick="fncGoList();">목록</button>
 		</div>
 	</div>