Merge branch 'jiwoo'

src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java

@@ -2713,6 +2713,8 @@ public class CmdPrcsInfoMngController {
 	    	//기반강화 조회
 	    	vEPrcsDetailVO.setLctrDivCd(LCTR_DIV_CD);	//강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부
 	    	
+	    	//사용 중인 과정만 조회
+	    	vEPrcsDetailVO.setUseYn("Y");
 	    	List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsService.selectPagingList(vEPrcsDetailVO);
 	    	
 	    	//3.pageing step3

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

@@ -2984,6 +2984,8 @@ public class CndtnPrcsInfoMngController {
 	    	//기반강화 조회
 	    	vEPrcsDetailVO.setLctrDivCd(LCTR_DIV_CD);	//강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부
 	    	
+	    	//사용 중인 과정만 조회
+	    	vEPrcsDetailVO.setUseYn("Y");
 	    	List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsService.selectPagingList(vEPrcsDetailVO);
 	    	
 	    	//3.pageing step3

src/main/java/kcc/ve/oprtn/prevent/web/PreventMngController.java

@@ -2514,6 +2514,8 @@ public class PreventMngController {
 	    	//기반강화 조회
 	    	vEPrcsDetailVO.setLctrDivCd(LCTR_DIV_CD);	//강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부
 	    	
+	    	//사용 중인 과정만 조회
+	    	vEPrcsDetailVO.setUseYn("Y");
 	    	List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsService.selectPagingList(vEPrcsDetailVO);
 	    	
 	    	//3.pageing step3

src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml

@@ -225,7 +225,13 @@
 			AND a.lctr_div_cd=#lctrDivCd#
 		</isNotEmpty>
 		
-		AND COALESCE(A.USE_YN,'Y')!='D'
+		<isNull property="useYn">
+			AND COALESCE(A.USE_YN,'Y')!='D'
+		</isNull>
+		
+		<isEqual property="useYn" compareValue="Y">
+			AND A.USE_YN ='Y'
+		</isEqual>
 		
 		<isNotEmpty property="searchSmbtStartDt">
 			/*등록일시*/

src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsMngReg.jsp

@@ -181,7 +181,7 @@
 
 					<tbody>
 					<tr>
-						<th scope="row">대면구분</th>
+						<th scope="row">교육구분</th>
 						<td colspan="3" style="position: relative;">
 							<ve:select codeId="VEA001" name="prcsDiv" id="prcsDiv" css="class='sel_type1'" 
 									selectedValue="" defaultValue=''

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

@@ -181,7 +181,7 @@
 
 					<tbody>
 					<tr>
-						<th scope="row">대면구분</th>
+						<th scope="row">교육구분</th>
 						<td colspan="3" style="position: relative;">
 							<ve:select codeId="VEA001" name="prcsDiv" id="prcsDiv" css="class='sel_type1'" 
 									selectedValue="" defaultValue=''

src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsMngReg.jsp

@@ -181,7 +181,7 @@
 
 					<tbody>
 					<tr>
-						<th scope="row">대면구분</th>
+						<th scope="row">교육구분</th>
 						<td colspan="3" style="position: relative;">
 							<ve:select codeId="VEA001" name="prcsDiv" id="prcsDiv" css="class='sel_type1'" 
 									selectedValue="" defaultValue=''