Merge branch 'jiwoo'

src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java

@@ -22,6 +22,7 @@ import kcc.kccadr.sch.service.SchduleManageVO;
 import kcc.let.uat.uia.service.SsoLoginVO;
 import kcc.let.uss.umt.service.UserManageVO;
 import kcc.let.utl.sim.service.AES256Util;
+import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO;
 import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduExcelVO;
 import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduSatisfactionExcelVO;
 import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO;
@@ -776,4 +777,15 @@ public class EgovCryptoUtil {
 		return vEPrcsDetailVOList;
 	}
 	
+	//강사 이력관리 복호화
+	public List<VEAStngVO> decryptVEAStngVOList(List<VEAStngVO> vEAStngVOOList) {
+		
+		for(VEAStngVO vo : vEAStngVOOList) {
+			vo.setUserNm(this.decrypt(vo.getUserNm()));
+		}
+		
+		// TODO Auto-generated method stub
+		return vEAStngVOOList;
+	}
+	
 }

src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java

@@ -248,13 +248,13 @@ public class OprtnInstrAdultPrflContoller {
 	    		comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO);
 	    		vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword());
 	    	}
-	    	//3.4 요청일 시작일 검색 시
+	    	//3.4 등록일 시작일 검색 시
 	    	if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){
-	    		selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')";
+	    		selectCondition += "AND TO_CHAR(a.frst_regist_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')";
 	    	}
-	    	//3.5 요청일 종료일 검색 시
+	    	//3.5 등록일 종료일 검색 시
 	    	if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){
-	    		selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')";
+	    		selectCondition += "AND TO_CHAR(a.frst_regist_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')";
 	    	}
 	    	
 	    	vEInstrDetailVO.setSelectPagingListQuery(selectCondition);
@@ -1074,13 +1074,13 @@ public class OprtnInstrAdultPrflContoller {
 	    		vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword());
 	    	}
 	    	//3.4 요청일 시작일 검색 시
-	    	if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){
+	    	//if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){
-	    		selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')";
+	    	//	selectCondition += "AND TO_CHAR(a.frst_regist_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')";
-	    	}
+	    	//}
 	    	//3.5 요청일 종료일 검색 시
-	    	if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){
+	    	//if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){
-	    		selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')";
+	    	//	selectCondition += "AND TO_CHAR(a.frst_regist_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')";
-	    	}
+	    	//}
 	    	vEInstrDetailVO.setInstrDiv(p_s_instr_div);
 	    	vEInstrDetailVO.setSelectPagingListQuery(selectCondition);
 	    	
@@ -1298,6 +1298,7 @@ public class OprtnInstrAdultPrflContoller {
 	    	VEAStngVO	vEAStngVO	=	new	VEAStngVO();
 	    	vEAStngVO.setUserId(vEInstrDetailVO.getUserId());
 	    	List<VEAStngVO>	selectList_VEAIHM	=	vEAStngService.selectList_VEAIHM(vEAStngVO);
+	    	selectList_VEAIHM = egovCryptoUtil.decryptVEAStngVOList(selectList_VEAIHM);
 	    	
 	    	model.addAttribute("selectListVEAIHM",selectList_VEAIHM);
 			
@@ -1978,7 +1979,7 @@ public class OprtnInstrAdultPrflContoller {
 	    	p_vEInstrDetailVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage());
 	    	
 	    	if("".equals(p_vEInstrDetailVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
-	    		p_vEInstrDetailVO.setSearchSortCnd("sbmt_pnttm");
+	    		p_vEInstrDetailVO.setSearchSortCnd("frst_regist_pnttm");
 	    		p_vEInstrDetailVO.setSearchSortOrd("desc");
 	    	}
 	    	

src/main/java/kcc/ve/oprtn/instr/cmdTrgtEdu/instrInfo/web/CmdTrgtInstrContoller.java

@@ -247,13 +247,13 @@ public class CmdTrgtInstrContoller {
 	    		comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO);
 	    		vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword());
 	    	}
-	    	//3.4 요청일 시작일 검색 시
+	    	//3.4 등록일 시작일 검색 시
 	    	if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){
-	    		selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')";
+	    		selectCondition += "AND TO_CHAR(a.frst_regist_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')";
 	    	}
-	    	//3.5 요청일 종료일 검색 시
+	    	//3.5 등록일 종료일 검색 시
 	    	if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){
-	    		selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')";
+	    		selectCondition += "AND TO_CHAR(a.frst_regist_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')";
 	    	}
 	    	
 	    	vEInstrDetailVO.setSelectPagingListQuery(selectCondition);
@@ -1073,13 +1073,13 @@ public class CmdTrgtInstrContoller {
 	    		vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword());
 	    	}
 	    	//3.4 요청일 시작일 검색 시
-	    	if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){
+	    	//if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){
-	    		selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')";
+	    	//	selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')";
-	    	}
+	    	//}
 	    	//3.5 요청일 종료일 검색 시
-	    	if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){
+	    	//if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){
-	    		selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')";
+	    	//	selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')";
-	    	}
+	    	//}
 	    	vEInstrDetailVO.setInstrDiv(p_s_instr_div);
 	    	vEInstrDetailVO.setSelectPagingListQuery(selectCondition);
 	    	
@@ -1297,6 +1297,7 @@ public class CmdTrgtInstrContoller {
 	    	VEAStngVO	vEAStngVO	=	new	VEAStngVO();
 	    	vEAStngVO.setUserId(vEInstrDetailVO.getUserId());
 	    	List<VEAStngVO>	selectList_VEAIHM	=	vEAStngService.selectList_VEAIHM(vEAStngVO);
+	    	selectList_VEAIHM = egovCryptoUtil.decryptVEAStngVOList(selectList_VEAIHM);
 	    	
 	    	model.addAttribute("selectListVEAIHM",selectList_VEAIHM);
 			
@@ -1977,7 +1978,7 @@ public class CmdTrgtInstrContoller {
 	    	p_vEInstrDetailVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage());
 	    	
 	    	if("".equals(p_vEInstrDetailVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
-	    		p_vEInstrDetailVO.setSearchSortCnd("sbmt_pnttm");
+	    		p_vEInstrDetailVO.setSearchSortCnd("frst_regist_pnttm");
 	    		p_vEInstrDetailVO.setSearchSortOrd("desc");
 	    	}
 	    	

src/main/java/kcc/ve/oprtn/instr/preventEdu/instrInfo/web/PreventInstrContoller.java

@@ -247,13 +247,13 @@ public class PreventInstrContoller {
 	    		comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO);
 	    		vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword());
 	    	}
-	    	//3.4 요청일 시작일 검색 시
+	    	//3.4 등록일 시작일 검색 시
 	    	if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){
-	    		selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')";
+	    		selectCondition += "AND TO_CHAR(a.frst_regist_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')";
 	    	}
-	    	//3.5 요청일 종료일 검색 시
+	    	//3.5 등록일 종료일 검색 시
 	    	if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){
-	    		selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')";
+	    		selectCondition += "AND TO_CHAR(a.frst_regist_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')";
 	    	}
 	    	
 	    	vEInstrDetailVO.setSelectPagingListQuery(selectCondition);
@@ -1073,13 +1073,13 @@ public class PreventInstrContoller {
 	    		vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword());
 	    	}
 	    	//3.4 요청일 시작일 검색 시
-	    	if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){
+	    	//if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){
-	    		selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')";
+	    	//	selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')";
-	    	}
+	    	//}
 	    	//3.5 요청일 종료일 검색 시
-	    	if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){
+	    	//if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){
-	    		selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')";
+	    	//	selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')";
-	    	}
+	    	//}
 	    	vEInstrDetailVO.setInstrDiv(p_s_instr_div);
 	    	vEInstrDetailVO.setSelectPagingListQuery(selectCondition);
 	    	
@@ -1297,6 +1297,7 @@ public class PreventInstrContoller {
 	    	VEAStngVO	vEAStngVO	=	new	VEAStngVO();
 	    	vEAStngVO.setUserId(vEInstrDetailVO.getUserId());
 	    	List<VEAStngVO>	selectList_VEAIHM	=	vEAStngService.selectList_VEAIHM(vEAStngVO);
+	    	selectList_VEAIHM = egovCryptoUtil.decryptVEAStngVOList(selectList_VEAIHM);
 	    	
 	    	model.addAttribute("selectListVEAIHM",selectList_VEAIHM);
 			
@@ -1977,7 +1978,7 @@ public class PreventInstrContoller {
 	    	p_vEInstrDetailVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage());
 	    	
 	    	if("".equals(p_vEInstrDetailVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
-	    		p_vEInstrDetailVO.setSearchSortCnd("sbmt_pnttm");
+	    		p_vEInstrDetailVO.setSearchSortCnd("frst_regist_pnttm");
 	    		p_vEInstrDetailVO.setSearchSortOrd("desc");
 	    	}
 	    	

src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngList.jsp

@@ -129,7 +129,7 @@
 					</div>
 					<div class="list_top_2">
 						<div class="util_left">
-							<p>요청일자</p>
+							<p>등록일자</p>
 						</div>
 						<div class="util_right">
 							<div class="calendar_wrap">
@@ -141,43 +141,22 @@
 							</div>							
 						</div>
 					</div>
-									
-					<%-- <div class="list_util">
-						<div class="detail_search">
-							<ul>
-								<li>
-									<p class="tit_text">이름</p>
-									<input type="text" id=searchKeyword name="searchKeyword" class="search_input" placeholder="검색어를 입력하세요" value="<c:out value='${vEInstrDetailVO.searchKeyword}'/>">
-								</li>
-								<li>
-									<p class="tit_text">요청일</p>
-									<div class="radio_wrap">
-										<div id="sel_date" class="sel_date">
-											<input type="text" class="startDate inp" title="검색시작일" id="startDate01" name="searchStartDt" value="${vEInstrDetailVO.searchStartDt}" data-datecontrol="true" style="margin-left:15px;" 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> ~
-											<input type="text" class="endDate inp" title="검색시작일" id="endDate" name="searchEndDt" value="${vEInstrDetailVO.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>
-									<button class="btn_search" onclick="fncGoList(); return false;">검색</button>
-								</li>
-							</ul>
-						</div>
-					</div> --%>
-					
 				</div>
 				<!-- //list_top -->
 
+				<!-- list util -->
+				<div class="list_util">
+					<p class="list_util_p">총 건수 : <span><c:out value="${paginationInfo.totalRecordCount}" /></span>건</p>
+					<div>
+						<select class="sel_type1" name="pageUnit" id="pageUnit" onchange="linkPage(1);" title="줄 선택" style="width: 140px">
+							<option value='10' <c:if test="${vEInstrDetailVO.pageUnit == '10' or vEEduAplctVO.pageUnit == ''}">selected</c:if>>10줄</option>
+							<option value='20' <c:if test="${vEInstrDetailVO.pageUnit == '20'}">selected</c:if>>20줄</option>
+							<option value='30' <c:if test="${vEInstrDetailVO.pageUnit == '30'}">selected</c:if>>30줄</option>
+							<option value='100' <c:if test="${vEInstrDetailVO.pageUnit == '100'}">selected</c:if>>100줄</option>
+						</select>
+					</div>
+				</div>
+				
 				<!-- list -->
 				<div class="tb_type01">
 					<table>
@@ -196,7 +175,7 @@
 							<th>직위</th>
 							<th>위촉년도</th>
 							<th>구분</th>
-							<th>요청일</th>
+							<th>등록일</th>
 						</tr>
 						</thead>
 						<tbody>
@@ -218,13 +197,12 @@
 									<ve:code codeId="VE0018" code="${list.divCd}"/>
 								</td>
 								<td>
-									<fmt:parseDate value="${list.sbmtPnttm}" var="sbmtPnttm" pattern="yyyy-MM-dd"/>
+									<c:out value="${list.frstRegistPnttm}"/>
-									<fmt:formatDate value="${sbmtPnttm}" pattern="yyyy.MM.dd"/>
 								</td>
 							</tr>
 						</c:forEach>
 						<c:if test="${empty resultList}">
-							<tr><td colspan="7"><spring:message code="common.nodata.msg" /></td></tr>
+							<tr><td colspan="6"><spring:message code="common.nodata.msg" /></td></tr>
 						</c:if>
 						</tbody>
 					</table>

src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp

@@ -452,18 +452,6 @@ function getYears(getYear){
 							</th>
 							<td colspan="3" style="position: relative;">
 								<c:out value='${info.instrNm}' />
-								<div class="put_photo">
-									<div class="put_photo_in">
-										<div class="put_photo_box">
-											<c:if test="${empty info.phtAtchFileId}">
-												<img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
-											</c:if>
-											<c:if test="${not empty info.phtAtchFileId}">
-												<img id="instrPhoto" class="id_pic" alt="${info.instrNm} 사진" src='<c:url value='/uss/ion/pwm/getImage.do'/>?atchFileId=<c:out value="${info.phtAtchFileId}"/>' />
-											</c:if>
-										</div>
-									</div>
-								</div>
 							</td>
 						</tr>
 						<tr>
@@ -531,7 +519,7 @@ function getYears(getYear){
 							</th>
 							<td colspan="3"><c:out value='${info.prfsnFld}' /></td>
 						</tr>
-						<tr>
+						<%-- <tr>
 							<th scope="row">
 								<p>강의희망 교육분야</p>
 							</th>
@@ -548,7 +536,7 @@ function getYears(getYear){
 									</script>
 								</c:forEach> 
 							</td>
-						</tr>
+						</tr> --%>
 						
 						<%-- <tr>
 							<th scope="row">
@@ -556,7 +544,7 @@ function getYears(getYear){
 							</th>
 							<td colspan="3"><c:out value='${info.mnLctrCn}' /></td>
 						</tr> --%>
-						<tr>
+						<%-- <tr>
 							<th scope="row">
 								<p>강의설정</p>
 							</th>
@@ -570,8 +558,8 @@ function getYears(getYear){
 									</c:otherwise>
 								</c:choose>
 							</td>
-						</tr>
+						</tr> --%>
-						<tr>
+						<%-- <tr>
 							<th scope="row">
 								<p>요청사항</p>
 							</th>
@@ -585,7 +573,7 @@ function getYears(getYear){
 									</c:otherwise>
 								</c:choose>
 							</td>
-						</tr>
+						</tr> --%>
 					</tbody>
 				</table>
 			</div>
@@ -631,14 +619,6 @@ function getYears(getYear){
 							</th>
 							<td colspan="3" style="position: relative;">
 								<input type="text" name="instrNm" value="<c:out value='${info.instrNm}' />"/>								
-			                    <div class="put_photo">
-									<div class="put_photo_in">
-										<div class="put_photo_box">
-											<img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
-										</div>
-										<!-- <button type="button" class="btnType01" onclick="fncPhotoPopup(); return false;">사진등록</button> -->
-									</div>
-			                    </div>
 							</td>
 						</tr>
 						<tr>
@@ -775,7 +755,7 @@ function getYears(getYear){
 - SW코딩, 사물인터넷,인공지능,인성, 비젼, 캠프, 인터넷중독, 가족치료, 저작권 개론 등"><c:out value='${info.prfsnFld}'/></textarea>
 							</td>
 						</tr>
-						<tr>
+						<%-- <tr>
 							<th scope="row">
 								<p class="req_text"><span>필수입력 항목</span>*</p>
 								<p>강의희망 교육분야</p>
@@ -792,7 +772,7 @@ function getYears(getYear){
 									</script>
 								</c:forEach> 
 							</td>
-						</tr>
+						</tr> --%>
 						<!-- <tr>
 							<th scope="row">
 								<p>위촉구분</p>

src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp

@@ -235,21 +235,17 @@
 							<col style="width: 10%;">
 							<col style="width: 9%;">
 							<col style="width: auto;">
-							<col style="width: 12%;">
 							<%-- <col style="width: 12%;"> --%>
 							<col style="width: 8%;">
-							<col style="width: 12%;">
 						</colgroup>
 						<thead>
 						<tr>
 						<th><input type="checkbox" name="checkAll" id="checkAll" onclick="chkAll(this);" /><label for="checkAll"></label></th>
 							<th scope="col">이름</th>
 							<th scope="col">구분</th>
-							<th scope="col">강의 가능지역</th>
 							<th scope="col">연락처</th>
 							<!-- <th scope="col">주 5일여부</th> -->
 							<th scope="col">자격 종료 여부</th>
-							<th scope="col">요청 사항</th>
 						</tr>
 						</thead>
 						<tbody>
@@ -266,19 +262,6 @@
 									<ve:code codeId="VE0018" code="${list.apptDiv}"/>
 									
 								</td>
-								<td>
-									<c:choose>
-										<c:when test="${list.lctrAreaCnt eq '0'}">
-											-
-										</c:when>
-										<c:when test="${list.lctrAreaCnt eq '1'}">
-											${list.lctrAreaNm}
-										</c:when>
-										<c:when test="${list.lctrAreaCnt > '1'}">
-											${list.lctrAreaNm} 외 ${list.lctrAreaCnt -1}개 지역
-										</c:when>
-									</c:choose>
-								</td>
 								<td>
 									<c:out value="${list.phone}"/>
 								</td>
@@ -293,26 +276,10 @@
 										해촉
 									</c:if>
 								</td>
-								<td>
-									<%-- <c:if test="${list.rqstCnt < 1}">
-										-
-									</c:if>
-									<c:if test="${list.rqstCnt >= 1}">
-										<button class="btn_type06" onclick="fncRqstPopup('<c:out value="${list.userId}"/>','<c:out value="${list.instrDiv}"/>');">변경요청</button>
-									</c:if> --%>
-									<c:choose>
-										<c:when test="${list.rqstCnt >= 1 or list.stngCnt >= 1}">
-											 O
-										</c:when>
-										<c:otherwise>
-											X
-										</c:otherwise>
-									</c:choose>
-								</td>
 							</tr>
 						</c:forEach>
 						<c:if test="${empty resultList}">
-							<tr><td colspan="8"><spring:message code="common.nodata.msg" /></td></tr>
+							<tr><td colspan="5"><spring:message code="common.nodata.msg" /></td></tr>
 						</c:if>
 						</tbody>
 					</table>

src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgtEdu/instrAplctMngList.jsp

@@ -129,7 +129,7 @@
 					</div>
 					<div class="list_top_2">
 						<div class="util_left">
-							<p>요청일자</p>
+							<p>등록일자</p>
 						</div>
 						<div class="util_right">
 							<div class="calendar_wrap">
@@ -141,43 +141,22 @@
 							</div>							
 						</div>
 					</div>
-									
-					<%-- <div class="list_util">
-						<div class="detail_search">
-							<ul>
-								<li>
-									<p class="tit_text">이름</p>
-									<input type="text" id=searchKeyword name="searchKeyword" class="search_input" placeholder="검색어를 입력하세요" value="<c:out value='${vEInstrDetailVO.searchKeyword}'/>">
-								</li>
-								<li>
-									<p class="tit_text">요청일</p>
-									<div class="radio_wrap">
-										<div id="sel_date" class="sel_date">
-											<input type="text" class="startDate inp" title="검색시작일" id="startDate01" name="searchStartDt" value="${vEInstrDetailVO.searchStartDt}" data-datecontrol="true" style="margin-left:15px;" 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> ~
-											<input type="text" class="endDate inp" title="검색시작일" id="endDate" name="searchEndDt" value="${vEInstrDetailVO.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>
-									<button class="btn_search" onclick="fncGoList(); return false;">검색</button>
-								</li>
-							</ul>
-						</div>
-					</div> --%>
-					
 				</div>
 				<!-- //list_top -->
 
+				<!-- list util -->
+				<div class="list_util">
+					<p class="list_util_p">총 건수 : <span><c:out value="${paginationInfo.totalRecordCount}" /></span>건</p>
+					<div>
+						<select class="sel_type1" name="pageUnit" id="pageUnit" onchange="linkPage(1);" title="줄 선택" style="width: 140px">
+							<option value='10' <c:if test="${vEInstrDetailVO.pageUnit == '10' or vEEduAplctVO.pageUnit == ''}">selected</c:if>>10줄</option>
+							<option value='20' <c:if test="${vEInstrDetailVO.pageUnit == '20'}">selected</c:if>>20줄</option>
+							<option value='30' <c:if test="${vEInstrDetailVO.pageUnit == '30'}">selected</c:if>>30줄</option>
+							<option value='100' <c:if test="${vEInstrDetailVO.pageUnit == '100'}">selected</c:if>>100줄</option>
+						</select>
+					</div>
+				</div>
+				
 				<!-- list -->
 				<div class="tb_type01">
 					<table>
@@ -196,7 +175,7 @@
 							<th>직위</th>
 							<th>위촉년도</th>
 							<th>구분</th>
-							<th>요청일</th>
+							<th>등록일</th>
 						</tr>
 						</thead>
 						<tbody>
@@ -218,13 +197,12 @@
 									<ve:code codeId="VE0018" code="${list.divCd}"/>
 								</td>
 								<td>
-									<fmt:parseDate value="${list.sbmtPnttm}" var="sbmtPnttm" pattern="yyyy-MM-dd"/>
+									<c:out value="${list.frstRegistPnttm}"/>
-									<fmt:formatDate value="${sbmtPnttm}" pattern="yyyy.MM.dd"/>
 								</td>
 							</tr>
 						</c:forEach>
 						<c:if test="${empty resultList}">
-							<tr><td colspan="7"><spring:message code="common.nodata.msg" /></td></tr>
+							<tr><td colspan="6"><spring:message code="common.nodata.msg" /></td></tr>
 						</c:if>
 						</tbody>
 					</table>

src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgtEdu/instrMngDetail.jsp

@@ -452,18 +452,6 @@ function getYears(getYear){
 							</th>
 							<td colspan="3" style="position: relative;">
 								<c:out value='${info.instrNm}' />
-								<div class="put_photo">
-									<div class="put_photo_in">
-										<div class="put_photo_box">
-											<c:if test="${empty info.phtAtchFileId}">
-												<img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
-											</c:if>
-											<c:if test="${not empty info.phtAtchFileId}">
-												<img id="instrPhoto" class="id_pic" alt="${info.instrNm} 사진" src='<c:url value='/uss/ion/pwm/getImage.do'/>?atchFileId=<c:out value="${info.phtAtchFileId}"/>' />
-											</c:if>
-										</div>
-									</div>
-								</div>
 							</td>
 						</tr>
 						<tr>
@@ -531,7 +519,7 @@ function getYears(getYear){
 							</th>
 							<td colspan="3"><c:out value='${info.prfsnFld}' /></td>
 						</tr>
-						<tr>
+						<%-- <tr>
 							<th scope="row">
 								<p>강의희망 교육분야</p>
 							</th>
@@ -548,7 +536,7 @@ function getYears(getYear){
 									</script>
 								</c:forEach> 
 							</td>
-						</tr>
+						</tr> --%>
 						
 						<%-- <tr>
 							<th scope="row">
@@ -556,7 +544,7 @@ function getYears(getYear){
 							</th>
 							<td colspan="3"><c:out value='${info.mnLctrCn}' /></td>
 						</tr> --%>
-						<tr>
+						<%-- <tr>
 							<th scope="row">
 								<p>강의설정</p>
 							</th>
@@ -585,7 +573,7 @@ function getYears(getYear){
 									</c:otherwise>
 								</c:choose>
 							</td>
-						</tr>
+						</tr> --%>
 					</tbody>
 				</table>
 			</div>
@@ -631,14 +619,6 @@ function getYears(getYear){
 							</th>
 							<td colspan="3" style="position: relative;">
 								<input type="text" name="instrNm" value="<c:out value='${info.instrNm}' />"/>								
-			                    <div class="put_photo">
-									<div class="put_photo_in">
-										<div class="put_photo_box">
-											<img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
-										</div>
-										<!-- <button type="button" class="btnType01" onclick="fncPhotoPopup(); return false;">사진등록</button> -->
-									</div>
-			                    </div>
 							</td>
 						</tr>
 						<tr>
@@ -775,7 +755,7 @@ function getYears(getYear){
 - SW코딩, 사물인터넷,인공지능,인성, 비젼, 캠프, 인터넷중독, 가족치료, 저작권 개론 등"><c:out value='${info.prfsnFld}'/></textarea>
 							</td>
 						</tr>
-						<tr>
+						<%-- <tr>
 							<th scope="row">
 								<p class="req_text"><span>필수입력 항목</span>*</p>
 								<p>강의희망 교육분야</p>
@@ -792,7 +772,7 @@ function getYears(getYear){
 									</script>
 								</c:forEach> 
 							</td>
-						</tr>
+						</tr> --%>
 						<!-- <tr>
 							<th scope="row">
 								<p>위촉구분</p>

src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgtEdu/instrMngList.jsp

@@ -235,21 +235,17 @@
 							<col style="width: 10%;">
 							<col style="width: 9%;">
 							<col style="width: auto;">
-							<col style="width: 12%;">
 							<%-- <col style="width: 12%;"> --%>
 							<col style="width: 8%;">
-							<col style="width: 12%;">
 						</colgroup>
 						<thead>
 						<tr>
 						<th><input type="checkbox" name="checkAll" id="checkAll" onclick="chkAll(this);" /><label for="checkAll"></label></th>
 							<th scope="col">이름</th>
 							<th scope="col">구분</th>
-							<th scope="col">강의 가능지역</th>
 							<th scope="col">연락처</th>
 							<!-- <th scope="col">주 5일여부</th> -->
 							<th scope="col">자격 종료 여부</th>
-							<th scope="col">요청 사항</th>
 						</tr>
 						</thead>
 						<tbody>
@@ -266,19 +262,6 @@
 									<ve:code codeId="VE0018" code="${list.apptDiv}"/>
 									
 								</td>
-								<td>
-									<c:choose>
-										<c:when test="${list.lctrAreaCnt eq '0'}">
-											-
-										</c:when>
-										<c:when test="${list.lctrAreaCnt eq '1'}">
-											${list.lctrAreaNm}
-										</c:when>
-										<c:when test="${list.lctrAreaCnt > '1'}">
-											${list.lctrAreaNm} 외 ${list.lctrAreaCnt -1}개 지역
-										</c:when>
-									</c:choose>
-								</td>
 								<td>
 									<c:out value="${list.phone}"/>
 								</td>
@@ -293,26 +276,10 @@
 										해촉
 									</c:if>
 								</td>
-								<td>
-									<%-- <c:if test="${list.rqstCnt < 1}">
-										-
-									</c:if>
-									<c:if test="${list.rqstCnt >= 1}">
-										<button class="btn_type06" onclick="fncRqstPopup('<c:out value="${list.userId}"/>','<c:out value="${list.instrDiv}"/>');">변경요청</button>
-									</c:if> --%>
-									<c:choose>
-										<c:when test="${list.rqstCnt >= 1 or list.stngCnt >= 1}">
-											 O
-										</c:when>
-										<c:otherwise>
-											X
-										</c:otherwise>
-									</c:choose>
-								</td>
 							</tr>
 						</c:forEach>
 						<c:if test="${empty resultList}">
-							<tr><td colspan="8"><spring:message code="common.nodata.msg" /></td></tr>
+							<tr><td colspan="5"><spring:message code="common.nodata.msg" /></td></tr>
 						</c:if>
 						</tbody>
 					</table>

src/main/webapp/WEB-INF/jsp/oprtn/preventEdu/instrAplctMngList.jsp

@@ -129,7 +129,7 @@
 					</div>
 					<div class="list_top_2">
 						<div class="util_left">
-							<p>요청일자</p>
+							<p>등록일자</p>
 						</div>
 						<div class="util_right">
 							<div class="calendar_wrap">
@@ -142,42 +142,22 @@
 						</div>
 					</div>
 					
-					<%-- <div class="list_util">
-						<div class="detail_search">
-							<ul>
-								<li>
-									<p class="tit_text">이름</p>
-									<input type="text" id=searchKeyword name="searchKeyword" class="search_input" placeholder="검색어를 입력하세요" value="<c:out value='${vEInstrDetailVO.searchKeyword}'/>">
-								</li>
-								<li>
-									<p class="tit_text">요청일</p>
-									<div class="radio_wrap">
-										<div id="sel_date" class="sel_date">
-											<input type="text" class="startDate inp" title="검색시작일" id="startDate01" name="searchStartDt" value="${vEInstrDetailVO.searchStartDt}" data-datecontrol="true" style="margin-left:15px;" 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> ~
-											<input type="text" class="endDate inp" title="검색시작일" id="endDate" name="searchEndDt" value="${vEInstrDetailVO.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>
-									<button class="btn_search" onclick="fncGoList(); return false;">검색</button>
-								</li>
-							</ul>
-						</div>
-					</div> --%>
-					
 				</div>
 				<!-- //list_top -->
 
+				<!-- list util -->
+				<div class="list_util">
+					<p class="list_util_p">총 건수 : <span><c:out value="${paginationInfo.totalRecordCount}" /></span>건</p>
+					<div>
+						<select class="sel_type1" name="pageUnit" id="pageUnit" onchange="linkPage(1);" title="줄 선택" style="width: 140px">
+							<option value='10' <c:if test="${vEInstrDetailVO.pageUnit == '10' or vEEduAplctVO.pageUnit == ''}">selected</c:if>>10줄</option>
+							<option value='20' <c:if test="${vEInstrDetailVO.pageUnit == '20'}">selected</c:if>>20줄</option>
+							<option value='30' <c:if test="${vEInstrDetailVO.pageUnit == '30'}">selected</c:if>>30줄</option>
+							<option value='100' <c:if test="${vEInstrDetailVO.pageUnit == '100'}">selected</c:if>>100줄</option>
+						</select>
+					</div>
+				</div>
+				
 				<!-- list -->
 				<div class="tb_type01">
 					<table>
@@ -196,7 +176,7 @@
 							<th>직위</th>
 							<th>위촉년도</th>
 							<th>구분</th>
-							<th>요청일</th>
+							<th>등록일</th>
 						</tr>
 						</thead>
 						<tbody>
@@ -218,13 +198,12 @@
 									<ve:code codeId="VE0018" code="${list.divCd}"/>
 								</td>
 								<td>
-									<fmt:parseDate value="${list.sbmtPnttm}" var="sbmtPnttm" pattern="yyyy-MM-dd"/>
+									<c:out value="${list.frstRegistPnttm}"/>
-									<fmt:formatDate value="${sbmtPnttm}" pattern="yyyy.MM.dd"/>
 								</td>
 							</tr>
 						</c:forEach>
 						<c:if test="${empty resultList}">
-							<tr><td colspan="7"><spring:message code="common.nodata.msg" /></td></tr>
+							<tr><td colspan="6"><spring:message code="common.nodata.msg" /></td></tr>
 						</c:if>
 						</tbody>
 					</table>

src/main/webapp/WEB-INF/jsp/oprtn/preventEdu/instrMngDetail.jsp

@@ -452,18 +452,6 @@ function getYears(getYear){
 							</th>
 							<td colspan="3" style="position: relative;">
 								<c:out value='${info.instrNm}' />
-								<div class="put_photo">
-									<div class="put_photo_in">
-										<div class="put_photo_box">
-											<c:if test="${empty info.phtAtchFileId}">
-												<img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
-											</c:if>
-											<c:if test="${not empty info.phtAtchFileId}">
-												<img id="instrPhoto" class="id_pic" alt="${info.instrNm} 사진" src='<c:url value='/uss/ion/pwm/getImage.do'/>?atchFileId=<c:out value="${info.phtAtchFileId}"/>' />
-											</c:if>
-										</div>
-									</div>
-								</div>
 							</td>
 						</tr>
 						<tr>
@@ -531,7 +519,7 @@ function getYears(getYear){
 							</th>
 							<td colspan="3"><c:out value='${info.prfsnFld}' /></td>
 						</tr>
-						<tr>
+						<%-- <tr>
 							<th scope="row">
 								<p>강의희망 교육분야</p>
 							</th>
@@ -548,7 +536,7 @@ function getYears(getYear){
 									</script>
 								</c:forEach> 
 							</td>
-						</tr>
+						</tr> --%>
 						
 						<%-- <tr>
 							<th scope="row">
@@ -556,7 +544,7 @@ function getYears(getYear){
 							</th>
 							<td colspan="3"><c:out value='${info.mnLctrCn}' /></td>
 						</tr> --%>
-						<tr>
+						<%-- <tr>
 							<th scope="row">
 								<p>강의설정</p>
 							</th>
@@ -585,7 +573,7 @@ function getYears(getYear){
 									</c:otherwise>
 								</c:choose>
 							</td>
-						</tr>
+						</tr> --%>
 					</tbody>
 				</table>
 			</div>
@@ -631,14 +619,6 @@ function getYears(getYear){
 							</th>
 							<td colspan="3" style="position: relative;">
 								<input type="text" name="instrNm" value="<c:out value='${info.instrNm}' />"/>								
-			                    <div class="put_photo">
-									<div class="put_photo_in">
-										<div class="put_photo_box">
-											<img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
-										</div>
-										<!-- <button type="button" class="btnType01" onclick="fncPhotoPopup(); return false;">사진등록</button> -->
-									</div>
-			                    </div>
 							</td>
 						</tr>
 						<tr>
@@ -775,7 +755,7 @@ function getYears(getYear){
 - SW코딩, 사물인터넷,인공지능,인성, 비젼, 캠프, 인터넷중독, 가족치료, 저작권 개론 등"><c:out value='${info.prfsnFld}'/></textarea>
 							</td>
 						</tr>
-						<tr>
+						<%-- <tr>
 							<th scope="row">
 								<p class="req_text"><span>필수입력 항목</span>*</p>
 								<p>강의희망 교육분야</p>
@@ -792,7 +772,7 @@ function getYears(getYear){
 									</script>
 								</c:forEach> 
 							</td>
-						</tr>
+						</tr> --%>
 						<!-- <tr>
 							<th scope="row">
 								<p>위촉구분</p>

src/main/webapp/WEB-INF/jsp/oprtn/preventEdu/instrMngList.jsp

@@ -235,21 +235,17 @@
 							<col style="width: 10%;">
 							<col style="width: 9%;">
 							<col style="width: auto;">
-							<col style="width: 12%;">
 							<%-- <col style="width: 12%;"> --%>
 							<col style="width: 8%;">
-							<col style="width: 12%;">
 						</colgroup>
 						<thead>
 						<tr>
 						<th><input type="checkbox" name="checkAll" id="checkAll" onclick="chkAll(this);" /><label for="checkAll"></label></th>
 							<th scope="col">이름</th>
 							<th scope="col">구분</th>
-							<th scope="col">강의 가능지역</th>
 							<th scope="col">연락처</th>
 							<!-- <th scope="col">주 5일여부</th> -->
 							<th scope="col">자격 종료 여부</th>
-							<th scope="col">요청 사항</th>
 						</tr>
 						</thead>
 						<tbody>
@@ -266,19 +262,6 @@
 									<ve:code codeId="VE0018" code="${list.apptDiv}"/>
 									
 								</td>
-								<td>
-									<c:choose>
-										<c:when test="${list.lctrAreaCnt eq '0'}">
-											-
-										</c:when>
-										<c:when test="${list.lctrAreaCnt eq '1'}">
-											${list.lctrAreaNm}
-										</c:when>
-										<c:when test="${list.lctrAreaCnt > '1'}">
-											${list.lctrAreaNm} 외 ${list.lctrAreaCnt -1}개 지역
-										</c:when>
-									</c:choose>
-								</td>
 								<td>
 									<c:out value="${list.phone}"/>
 								</td>
@@ -293,26 +276,10 @@
 										해촉
 									</c:if>
 								</td>
-								<td>
-									<%-- <c:if test="${list.rqstCnt < 1}">
-										-
-									</c:if>
-									<c:if test="${list.rqstCnt >= 1}">
-										<button class="btn_type06" onclick="fncRqstPopup('<c:out value="${list.userId}"/>','<c:out value="${list.instrDiv}"/>');">변경요청</button>
-									</c:if> --%>
-									<c:choose>
-										<c:when test="${list.rqstCnt >= 1 or list.stngCnt >= 1}">
-											 O
-										</c:when>
-										<c:otherwise>
-											X
-										</c:otherwise>
-									</c:choose>
-								</td>
 							</tr>
 						</c:forEach>
 						<c:if test="${empty resultList}">
-							<tr><td colspan="8"><spring:message code="common.nodata.msg" /></td></tr>
+							<tr><td colspan="5"><spring:message code="common.nodata.msg" /></td></tr>
 						</c:if>
 						</tbody>
 					</table>