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

src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java

@@ -3717,6 +3717,102 @@ public class EgovBBSManageController {
 	}
 	
 	
+	@RequestMapping(value= {"/web/cop/bbs/selectDataBoardList.do"})
+	public String selectDataBoardListWeb(HttpServletRequest request, @ModelAttribute("searchVO") BoardMasterVO boardMasterVO, ModelMap model ,
+			BoardVO boardVO , RedirectAttributes redirectAttributes) throws Exception {
+	
+	
+	return "web/cop/bbs/DataBoardList";
+	
+	
+	}
+	
+	@RequestMapping(value= {"/web/cop/bbs/selectDataBoardListAjax.do"})
+	public String selectDataBoardListAjaxWeb(HttpServletRequest request, @ModelAttribute("searchVO") BoardMasterVO boardMasterVO, ModelMap model ,
+			BoardVO boardVO , RedirectAttributes redirectAttributes) throws Exception {
+		
+		
+		BoardMasterVO bmVO = new BoardMasterVO();
+		bmVO.setBbsId(boardVO.getBbsId());
+		bmVO = bbsAttrbService.selectBBSMasterInf(bmVO);
+		
+		if (bmVO == null || ("N").equals(bmVO.getUseAt())) {
+			redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("fail.common.imposbl"));
+			return "redirect:/web/main/mainPage.do";
+		}
+		
+		boardVO.setPageUnit(Integer.parseInt(bmVO.getListNum()));
+		boardVO.setPageSize(Integer.parseInt(bmVO.getPageNum()));
+
+		PaginationInfo paginationInfo = new PaginationInfo();
+
+		paginationInfo.setCurrentPageNo(boardVO.getPageIndex());
+		paginationInfo.setRecordCountPerPage(boardVO.getPageUnit());
+		paginationInfo.setPageSize(boardVO.getPageSize());
+
+		boardVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+		boardVO.setLastIndex(paginationInfo.getLastRecordIndex());
+		boardVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+		
+		Map<String, Object> map = bbsMngService.selectBoardArticlesWeb(boardVO, null);
+		int totCnt = Integer.parseInt((String) map.get("resultCnt"));
+		paginationInfo.setTotalRecordCount(totCnt);
+		
+
+		List<BoardVO> resultList = (List<BoardVO>)map.get("resultList");
+		
+		//모바일
+		PaginationInfo paginationInfoMobile = new PaginationInfo();
+		paginationInfoMobile.setCurrentPageNo(paginationInfo.getCurrentPageNo());
+		paginationInfoMobile.setTotalRecordCount(paginationInfo.getTotalRecordCount());
+		paginationInfoMobile.setPageSize(5);
+		paginationInfoMobile.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+		
+		model.addAttribute("resultList", resultList);
+		model.addAttribute("resultCnt", map.get("resultCnt"));
+		model.addAttribute("boardVO", boardVO);
+		model.addAttribute("brdMstrVO", bmVO);
+		model.addAttribute("paginationInfo", paginationInfo);
+		model.addAttribute("paginationInfoMobile", paginationInfoMobile);
+		
+	return "web/cop/bbs/DataBoardListAjax";
+		
+		
+	}
+	
+	
+	@RequestMapping(value= {"/web/cop/bbs/selectDataBoardDetail.do"} )
+public String selectDataBoardArticleWeb(HttpServletRequest request, @ModelAttribute("searchVO") BoardVO boardVO, 
+		BoardMasterVO masterVO,
+		ModelMap model , 
+		@RequestParam Map<String, Object> commandMap,
+		RedirectAttributes redirectAttributes) throws Exception {
+
+	BoardMasterVO bmVO = new BoardMasterVO();
+	bmVO.setBbsId(boardVO.getBbsId());
+	bmVO = bbsAttrbService.selectBBSMasterInf(bmVO);
+	BoardVO bdVO = bbsMngService.selectBoardArticleWeb(boardVO);
+	if (bmVO == null || ("N").equals(bmVO.getUseAt())) {
+		redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("fail.common.imposbl"));
+		return "redirect:/web/main/mainPage.do";
+	}
+	
+	// 조회수 증가 여부 지정
+	boardVO.setPlusCount(true);
+	bbsMngService.updateBoardArticleInqireCo(boardVO);
+	
+	//게시판 마스터 옵션 정보
+	BoardMasterVO searchVO = new BoardMasterVO();
+	searchVO.setBbsId(boardVO.getBbsId());
+	BoardMasterVO resultBbsMsInfo = bbsAttrbService.selectBBSMasterInf(searchVO);
+	
+	model.addAttribute("result", bdVO);
+	model.addAttribute("brdMstrVO", bmVO);
+	model.addAttribute("resultBbsMsInfo", resultBbsMsInfo);
+	
+	return "web/cop/bbs/EgovDataNoticeInqire";
+}
+	
 	public String getDateDay(String date, String dateType) throws Exception {
 	    String day = "" ;
 	    SimpleDateFormat dateFormat = new SimpleDateFormat(dateType) ;

src/main/java/kcc/let/my/web/MyPageController.java

@@ -197,10 +197,10 @@ public class MyPageController {
 			vEEduChasiVO.setPageUnit(vEEduAplctVO.getPageUnit());
 			vEEduChasiVO.setPageSize(vEEduAplctVO.getPageSize());
 
-			List<VEEduChasiVO> vEEduChasiVOList = vEEduMIXService.selectChasiListMypage(vEEduChasiVO);
+			List<VEEduChasiVO> adultList = vEEduMIXService.selectChasiListMypage(vEEduChasiVO);
 			
 			
-			 Map<String, String> tngrMap = vEEduChasiVOList.stream()
+			 Map<String, String> tngrMap = adultList.stream()
 												.collect(Collectors.partitioningBy(vo -> "30".equals(vo.getAsgnmAprvlCd()), Collectors.counting()))
 												.entrySet().stream()
 												.collect(Collectors.toMap(
@@ -210,6 +210,7 @@ public class MyPageController {
 											);
 			
 			model.addAttribute("adultMap", tngrMap);
+			model.addAttribute("adultList", adultList);
 		}
 //		return "/web/cop/bbs/FaqListAjax";
 		return "web/my/myPageDashBoard";

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

@@ -90,6 +90,7 @@ public class EgovCryptoUtil {
 		if (!"".equals(p_vEEduAplctVO.getEmail())) p_vEEduAplctVO.setEmail(this.decrypt(p_vEEduAplctVO.getEmail()));
 		if (!"".equals(p_vEEduAplctVO.getInstrNm())) p_vEEduAplctVO.setInstrNm(this.decrypt(p_vEEduAplctVO.getInstrNm()));
 		if (!"".equals(p_vEEduAplctVO.getUserNm())) p_vEEduAplctVO.setUserNm(this.decrypt(p_vEEduAplctVO.getUserNm()));
+		if (!"".equals(p_vEEduAplctVO.getInstrPhone())) p_vEEduAplctVO.setInstrPhone(this.decrypt(p_vEEduAplctVO.getInstrPhone()));
 		return p_vEEduAplctVO;
 	}
 

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

@@ -334,6 +334,10 @@ public class FndtnEnhanceTrnController {
 		model.addAttribute("list", vEPrcsDetailVOList);
 		
 		{
+
+			vEPrcsDetailVO.setFirstIndex(0);
+			vEPrcsDetailVO.setRecordCountPerPage(10);
+			vEPrcsDetailVOList = vEPrcsAplctPrdService.selectPagingList4Fndth(vEPrcsDetailVO);
 			// 이달의 과정 LIST
 			// 날짜 형식 설정
 			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd");

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

@@ -347,6 +347,8 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
 	private String type; //첨부파일 삭제 종류
 	private String table; //첨부파일 삭제 테이블
 	
+	private String instrPhone; //강사 휴대폰
+	
 	
 	public String getPrcsAplctPrdOrd() {
 		return prcsAplctPrdOrd;
@@ -1840,6 +1842,12 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
 	public void setSspnIdtmtTrgtOrdList(List<String> sspnIdtmtTrgtOrdList) {
 		this.sspnIdtmtTrgtOrdList = sspnIdtmtTrgtOrdList;
 	}
+	public String getInstrPhone() {
+		return instrPhone;
+	}
+	public void setInstrPhone(String instrPhone) {
+		this.instrPhone = instrPhone;
+	}
 	
 	
 }

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

@@ -101,4 +101,6 @@ public interface VEEduMIXService {
 	List<VEEduAplctVO> selectExprnEndPagingList(VEEduAplctVO paramVO) throws Exception;
 
 	List<VEEduAplctVO> selectEduCmpltCrtfcNmbrList(VEEduAplctVO vEEduAplctVO) throws Exception;
+
+	List<VEEduAplctVO> selectCndtnList(VEEduAplctVO paramVO);
 }

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

@@ -250,5 +250,9 @@ public class VEEduMIXDAO extends EgovAbstractDAO {
 	public List<VEEduAplctVO> selectEduCmpltCrtfcNmbrList(VEEduAplctVO vEEduAplctVO) {
 		return (List<VEEduAplctVO>) list("VEEduMIXDAO.selectEduCmpltCrtfcNmbrList", vEEduAplctVO);
 	}
+
+	public List<VEEduAplctVO> selectCndtnList(VEEduAplctVO paramVO) {
+		return (List<VEEduAplctVO>) list("VEEduMIXDAO.selectCndtnList", paramVO);
+	}
 	
 }

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

@@ -221,5 +221,10 @@ public class VEEduMIXServiceImpl implements VEEduMIXService {
 	@Override
 	public List<VEEduAplctVO> selectEduCmpltCrtfcNmbrList(VEEduAplctVO vEEduAplctVO) throws Exception {
 		return vEEduMIXDAO.selectEduCmpltCrtfcNmbrList(vEEduAplctVO);
+	}
+
+	@Override
+	public List<VEEduAplctVO> selectCndtnList(VEEduAplctVO paramVO) {
+		return vEEduMIXDAO.selectCndtnList(paramVO);
 	}	
 }

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

@@ -671,7 +671,8 @@ public class CndtnPrcsInfoMngController {
 			
 			
 			
-			List<VEEduAplctVO> vEPrcsDetailVOList = vEEduMIXService.selectList(paramVO);
+//			List<VEEduAplctVO> vEPrcsDetailVOList = vEEduMIXService.selectList(paramVO);
+			List<VEEduAplctVO> vEPrcsDetailVOList = vEEduMIXService.selectCndtnList(paramVO);
 			vEPrcsDetailVOList = egovCryptoUtil.decryptVeEduAplctList(vEPrcsDetailVOList);
 
 			

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

@@ -147,7 +147,68 @@
 			a.EDU_APLCT_ORD  = vadi.EDU_APLCT_ORD 
 			/* AND vpap.PRCS_APLCT_PRD_ORD  = vadi.PRCS_APLCT_PRD_ORD */ 
 		JOIN LETTNGNRLMBER le ON
-			a.USER_ID = le.MBER_ID
+			a.USER_ID = le.ESNTL_ID
+		WHERE
+			1=1
+			<isNotEmpty property="prcsOrd">
+				AND a.prcs_ord=#prcsOrd#
+			</isNotEmpty>
+			<isNotEmpty property="sbmtYn">
+				AND a.sbmt_yn=#sbmtYn#
+			</isNotEmpty>
+			
+			<isNotEmpty property="searchSelStatus">
+				AND a.aprvl_cd = #searchSelStatus#
+			</isNotEmpty>
+			
+			<isNotEmpty property="searchQuery">
+				$searchQuery$
+			</isNotEmpty>
+			
+			<isNotEmpty property="searchSmbtStartDt">
+				AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchSmbtStartDt#, '.' , '')
+			</isNotEmpty>
+	
+			<isNotEmpty property="searchSmbtEndDt">
+				AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <![CDATA[ <= ]]> REPLACE(#searchSmbtEndDt#, '.' , '')
+			</isNotEmpty>
+			
+			AND a.use_yn = 'Y'
+			AND a.aprvl_cd != '40' /* 취소된 내역 안 보여줌 */
+			
+	</select>
+	
+	<select id="VEEduMIXDAO.selectCndtnList" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO">
+		/*	VEEduMIXDAO.selectCndtnList	*/
+		SELECT			
+			vadi.APLCT_STATE_CD AS aplctStateCd,  /* 이수 상태 */
+			vadi.CNCL_ATCH_FILE_ID AS cnclAtchFileId,
+			vadi.CNCL_CN AS cnclCn,          
+			le.MBER_NM AS userNm,
+			tr.CLPHONE,
+			<include refid="VEEduMIXDAO.select_column_name"/>,
+			CASE
+				WHEN EXISTS (/* 설문조사 */
+				SELECT
+					1
+				FROM
+					LETTNQESTNRRSLTDETAIL lersltD
+				WHERE
+					lersltD.respond_id = a.USER_ID
+					AND a.edu_aplct_ord = lersltD.edu_aplct_ord ) THEN 1
+				ELSE 0
+			END AS qestRsltExists
+		FROM 
+			<include refid="VEEduMIXDAO.table_name"/> a
+		JOIN ve_prcs_aplct_prd vpap ON
+			a.PRCS_ORD = vpap.PRCS_APLCT_PRD_ORD
+		LEFT JOIN VEA_APLCT_DETAIL_INFO  vadi ON
+			a.EDU_APLCT_ORD  = vadi.EDU_APLCT_ORD 
+			/* AND vpap.PRCS_APLCT_PRD_ORD  = vadi.PRCS_APLCT_PRD_ORD */ 
+		JOIN LETTNGNRLMBER le ON
+			a.USER_ID = le.ESNTL_ID
+		LEFT JOIN VEA_SSPN_IDMT_TRGT tr ON
+			a.USER_ID = tr.USER_ID
 		WHERE
 			1=1
 			<isNotEmpty property="prcsOrd">
@@ -3209,6 +3270,7 @@
 				
 				(SELECT a0.code_nm FROM LETTCCMMNDETAILCODE a0 WHERE a0.code_id='VE0019' AND a0.code=d.asgnm_aprvl_cd)		AS asgnmAprvlCd ,
 				e.instr_nm                            AS instrNm,
+				e.phone                               AS instrPhone,
 				g.atch_file_id                        AS atchFileId,
 				d.rmrks								  AS rmrks,
 				(select 

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

@@ -672,6 +672,15 @@
 		<isNotEmpty property="searchEndDt">
 			AND vpap.edu_strt_pnttm <![CDATA[ <= ]]> #searchEndDt#
 		</isNotEmpty>			
+		<isEqual property="searchStatus" compareValue="30">  
+			AND vadi.aplct_state_cd = #searchStatus#
+		</isEqual>			
+		<isEqual property="searchStatus" compareValue="20">  
+			AND vadi.aplct_state_cd = #searchStatus#
+		</isEqual>			
+		<isEqual property="searchStatus" compareValue="10">  
+			AND a.aprvl_cd = #searchStatus#
+		</isEqual>			
 			
 			/*AND a.aprvl_cd != '100' 찜하기 제거*/
 		ORDER BY vpap.edu_strt_pnttm desc

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

@@ -34,6 +34,7 @@
 			background-color: #ededed;
 		}
 	</style>
+	<script src="${pageContext.request.contextPath}/js/ve/sendSmsEmailUtil.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function(){
 
@@ -180,6 +181,26 @@
 			});
 		}
 		
+		function chkSendSms(){
+			var chkLen = $(listForm).find("input[name=chk]:checked").length;
+			
+			if(chkLen == 0){
+				alert("선택된 항목이 없습니다.");
+				return;
+			}
+
+			$('input:checkbox[name="chk"]:checked').each(function() {
+			sendSms(
+					$(this).data('instrphone'),
+					"교육운영 관리 시스템입니다." + $(this).data('instrnm')+"님의 " + $(this).data('date') + " 교육 강사료는 " + $(this).data('instrfeesum') +"입니다.", 
+					$(this).val().split('@')[0],
+					$(this).data('userid'),
+					"N"
+				);
+			});
+			alert("발송되었습니다.");
+			
+		}
 	</script>
 	<title>신청관리</title>
 </head>
@@ -297,7 +318,11 @@
 						<c:forEach var="list" items="${list}" varStatus="status">
 							<tr>
 								<td>
-									<input name="chk" class="${list.atchFileId}" value="${list.eduAplctOrd}@${list.eduChasiOrd}" title="Check" type="checkbox"/>
+									<input name="chk" class="${list.atchFileId}" value="${list.eduAplctOrd}@${list.eduChasiOrd}"
+									data-instrphone="<c:out value='${list.instrPhone}' />" data-userid="<c:out value='${list.userId}' />" 
+									data-date="<c:out value='${list.eduHopeDt}' /> <c:out value='${list.strtTm}' /> ~ <c:out value='${list.endTm}' />"
+									data-instrnm="<c:out value='${list.instrNm}' />" data-instrfeesum="<c:out value='${list.instrFeeSum}' />"
+									title="Check" type="checkbox"/>
 								</td>
 								<!-- 
 								<td>
@@ -373,6 +398,7 @@
 					<div class="btn_left">
 <!-- 						<button type="button" class="btn_type06" onclick="fnAcmdtFileZipDownload(); return false;">숙박영수증다운로드</button> -->
 						<button type="button" class="btn_type06" onclick="excelDownLoad();">지급내역다운로드</button>
+						<button type="button" class="btn_type06" onclick="chkSendSms();">강사료 안내 문자발송</button>
 					</div>
 					<div class="btn_center">
 					</div>

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

@@ -506,6 +506,7 @@
 							<c:when test="${!empty listPrcsAplct}">
 								<c:forEach var="list" items="${listPrcsAplct}" varStatus="status">
 									<tr>
+										<input type="hidden" id="clphone" value="<c:out value="${list.clphone }" />" />
 										<td>
 											<c:choose>
 												<c:when test="${list.aplctStateCd ne 30 and list.aplctStateCd ne 35}">

src/main/webapp/WEB-INF/jsp/web/cop/bbs/DataBoardList.jsp

@@ -0,0 +1,63 @@
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<script type="text/javascript">
+$(document).ready(function(){
+	/* 메뉴 첫 이동 시 교안 게시글 조회 */
+	$("#list1").click();
+});
+
+	function listLoad(bbsId, pageIndex){
+		$("#bbsId").val(bbsId);
+		$("#pageIndex").val(pageIndex);
+		var sendData = $(document.bbsForm).serializeArray();
+		$("#bbsLoad").load("<c:url value = '/web/cop/bbs/selectDataBoardListAjax.do' />", sendData ,function(response, status, xhr){
+		});
+	}
+	
+	function linkPage(pageNo) {
+		
+		$("#searchCnd").val($("#subSearch").val());
+		$("#searchWrd").val($("#subsearchTxt").val());
+		listLoad($("#bbsId").val(), pageNo);
+	}
+
+	function fn_egov_inqire_notice(bbsId, nttId) {
+		document.frm.nttId.value = nttId;
+		document.frm.bbsId.value = bbsId;
+		document.frm.method = "get";
+		document.frm.action = "<c:url value='/web/cop/bbs/selectDataBoardDetail.do'/>";
+		document.frm.submit();
+	}
+	
+	function enterkey() {
+		if (window.event.keyCode == 13) {
+	    	alert('1234');
+	    }
+	}
+	
+</script>
+	<form name="bbsForm" id="bbsForm">
+		<input type="hidden" name="bbsId" id="bbsId" value="">
+		<input type="hidden" name="pageIndex" id="pageIndex" value="">
+		<input type="hidden" name="searchCnd" id="searchCnd" value="">
+		<input type="hidden" name="searchWrd" id="searchWrd" value="">
+	</form>
+	<div class="cont_wrap" id="sub">
+		<div class="cont_tit">
+			<h2>자료실</h2>
+		</div>
+	
+		<ul class="tab tab_03">
+			<li class="tab_li"><button type="button" id="list1" class="tab_button" onclick="listLoad('BBSMSTR_000000000020', '1');">교안</button></li>
+			<li class="tab_li"><button type="button" id="list2" class="tab_button" onclick="listLoad('BBSMSTR_000000000021', '1');">콘텐츠</button></li>
+			<li class="tab_li"><button type="button" id="list3" class="tab_button" onclick="listLoad('BBSMSTR_000000000022', '1');">기타</button></li>
+		</ul>
+	
+		<div id="bbsLoad">
+			
+		</div>
+	</div>

src/main/webapp/WEB-INF/jsp/web/cop/bbs/DataBoardListAjax.jsp

@@ -0,0 +1,174 @@
+ <%--
+  Class Name : EgovNoticeList.jsp
+  Description : (사용자)게시물 목록화면
+  Modification Information
+ 
+      수정일         수정자                   수정내용
+    -------    --------    ---------------------------
+     2009.03.19   이삼섭              최초 생성
+     2011.08.31   JJY       경량환경 버전 생성
+ 
+    author   : 공통서비스 개발팀 이삼섭
+    since    : 2009.03.19
+--%>
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<script type="text/javascript">
+$(document).ready(function(){
+	//$(".btnSearch").keyup(function(e){if(e.keyCode == 13) linkPage('1');});
+});
+
+
+</script>
+	
+	<!-- content -->
+	<form name="frm" action="<c:url value='/web/cop/bbs/selectDataBoardList.do'/>" method="post" onsubmit="return false;">
+		<input type="hidden" name="bbsId" value="<c:out value='${boardVO.bbsId}'/>" />
+		<input type="hidden" name="nttId" value="" />
+		<input name="pageIndex" type="hidden" value="<c:out value='${searchVO.pageIndex}'/>" />
+		
+		<div class="list_top">
+			<div class="list_top_left">
+				<label for="subSearch" class="label">검색조건 선택</label>
+				<select id="subSearch" class="selType1">
+					<option value="" <c:if test="${searchVO.searchCnd == ''}">selected="selected"</c:if>>전체</option>
+                    <option value="0" <c:if test="${searchVO.searchCnd == '0'}">selected="selected"</c:if>>제목</option>
+                    <option value="1" <c:if test="${searchVO.searchCnd == '1'}">selected="selected"</c:if>>내용</option>
+				</select>
+			</div>
+                  <div class="btn_wrap">
+                      <input type="text" id="subsearchTxt"  placeholder="검색어를 입력해주세요" title="검색어 입력" size="30" value="<c:out value='${searchVO.searchWrd}'/>" >
+				<button type="button" class="btnType01" onclick="javascript:linkPage('1'); return false;" onkeyup="enterkey()";  >검색</button>
+                  </div>
+              </div>
+	</form>
+	<div class="tb_list01">
+		<table>
+			<colgroup>
+				<col style="width:5%;">
+                <col style="width:auto;">
+               <c:if test="${brdMstrVO.fileAtchPosblAt == 'Y'}">
+               	<col style="width:5%;">
+               </c:if>
+                <col style="width:10%;">
+                <col style="width:10%;">
+               <c:if test="${brdMstrVO.viewsYn ne 'N'}">	
+               	<col style="width:5%;">
+               </c:if>
+			</colgroup>
+			<thead>
+				<tr>
+					<th scrope="col">번호</th>
+					<th scrope="col">제목</th>
+					<c:if test="${brdMstrVO.fileAtchPosblAt == 'Y'}">
+						<th scope="col">첨부</th>
+					</c:if>
+               		<th scope="col">작성일</th>
+               		<th scope="col">작성자</th>
+               		<c:if test="${brdMstrVO.viewsYn ne 'N'}">
+               			<th scope="col">조회수</th>
+               		</c:if>
+				</tr>
+			</thead>
+			<tbody>
+				<c:forEach var="result" items="${resultList}" varStatus="status">
+					<tr>
+						<th scope="row">
+							<p><c:out value="${paginationInfo.totalRecordCount+1 - ((searchVO.pageIndex-1) * searchVO.pageUnit + status.count)}" /></p>
+						</th>
+                		<td class="t_left">
+	                        <a href="#none" onclick="javascript:fn_egov_inqire_notice('<c:out value="${result.bbsId}"/>', '<c:out value="${result.nttId}"/>');">
+	                        <c:out value="${result.nttSj}" />
+	                        </a>
+	                    </td>
+	                    <c:if test="${brdMstrVO.fileAtchPosblAt == 'Y'}"> <!-- 첨부파일 -->
+	                    	<td>
+		                    	<c:if test="${result.atchFileCnt > 0}">
+								<img src="<c:url value='/visitEdu/usr/publish/images/content/file_img.png'/>" alt="첨부파일 있음">
+								</c:if>
+	                    	</td>
+	                    </c:if>
+	                    <td><c:out value="${result.frstRegisterPnttm}" /></td>
+	                    <td><c:out value="${result.frstRegisterNm}" /></td>
+	                    <c:if test="${brdMstrVO.viewsYn ne 'N'}">
+		                    <td><c:out value="${result.inqireCo}" /></td>
+		                </c:if>    
+					</tr>
+				</c:forEach>
+				<c:if test="${empty resultList}">
+			    	<tr class="row">
+				    	<td colspan="6">
+				    		검색된 내용이 없습니다.
+				    	</td>
+			    	</tr>
+		    	</c:if>
+			</tbody>
+		</table>
+	</div>
+
+	<div class="tb_list01_m">
+		<c:forEach var="result" items="${resultList}" varStatus="status">
+			<ul>
+				<li>
+					<span>번호</span>
+					<span>
+						<c:out value="${paginationInfo.totalRecordCount+1 - ((searchVO.pageIndex-1) * searchVO.pageUnit + status.count)}" />
+					</span>
+				</li>
+				<li>
+					<span>제목</span>
+					<span>
+						<a href="#none"  title="현재창 상세이동" onclick="javascript:fn_egov_inqire_notice('<c:out value="${result.bbsId}"/>', '<c:out value="${result.nttId}"/>');">
+	                       	<c:out value="${result.nttSj}" />
+                        </a>
+                       </span>
+                      </li>
+                      <c:if test="${brdMstrVO.fileAtchPosblAt == 'Y'}"> <!-- 첨부파일 -->
+                      	<li>
+                      		<c:if test="${result.atchFileCnt > 0}">
+                      			<span>첨부</span>
+							<span><img src="<c:url value='/visitEdu/usr/publish/images/content/file_img.png'/>" alt="첨부파일 있음"></span>
+                      		</c:if>
+                      	</li>
+                      </c:if>
+				<li>
+					<span>작성일</span>
+					<span><c:out value="${result.frstRegisterPnttm}" /></span>
+				</li>
+				<li>
+					<span>작성자</span>
+					<span><c:out value="${result.frstRegisterNm}" /></span>
+				</li>
+				
+				<c:if test="${brdMstrVO.viewsYn ne 'N'}">
+					<li>
+						<span>조회수</span>
+						<span><c:out value="${result.inqireCo}" /></span>
+					</li>
+				</c:if>
+			</ul>
+		</c:forEach>
+		<%-- 게시물이 없을때 --%>
+		<c:if test="${empty resultList}">
+		
+		</c:if>
+	</div>
+
+	<div class="btn_wrap btn_layout01">
+		<div class="btn_left">
+		</div>
+		<div class="btn_center">
+		</div>
+		<div class="btn_right">
+ㅈ		</div>
+	</div>
+	<c:if test="${!empty resultList}">
+        <div class="page">
+            <ui:pagination paginationInfo = "${paginationInfo}"  type="imageWeb" jsFunction="linkPage" />
+        </div>		        
+       </c:if>
+	<!--// content -->

src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovDataNoticeInqire.jsp

@@ -0,0 +1,91 @@
+<%--
+  Class Name : EgovNoticeInqire.jsp
+  Description : (사용자)게시물 조회 화면
+  Modification Information
+ 
+      수정일      수정자              수정내용
+     ----------  --------    ---------------------------
+     2009.03.23   이삼섭        최초 생성
+     2009.06.26   한성곤        2단계 기능 추가 (댓글관리, 만족도조사)
+     2011.08.31   JJY       	경량환경 버전 생성
+     2013.05.23   이기하       	상세보기 오류수정
+ 
+    author   : 공통서비스 개발팀 이삼섭
+    since    : 2009.03.23
+--%>
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%pageContext.setAttribute("crlf", "\r\n"); %>
+<script type="text/javascript">
+$(document).ready(function(){
+});
+
+var listPage = $(location).attr('href').split($(location).attr('host'))[1].split('Detail.do')[0]+'List.do'+"?bbsId=<c:out value='${brdMstrVO.bbsId}' />"  ;
+var detailPage = $(location).attr('href').split($(location).attr('host'))[1].split('?')[0] ;
+  function fn_egov_select_noticeList(pageNo) {
+	  window.history.back();
+  }
+  
+</script>
+<!-- contents 영역 -->
+	<form:form commandName="searchForm" name="searchForm" method="get" action="<c:url value='/web/cop/bbsWeb/selectBoardList.do'/>">
+		<input name="pageIndex" type="hidden" value="<c:out value='${searchVO.pageIndex}'/>"/>
+		<input name="searchCnd" type="hidden" value="<c:out value='${searchVO.searchCnd}'/>"/>
+		<input name="searchWrd" type="hidden" value="<c:out value='${searchVO.searchWrd}'/>"/>
+		<input name="bbsId" type="hidden" value="<c:out value='${result.bbsId}'/>" />
+		<input name="nttId" type="hidden" value="<c:out value='${result.nttId}'/>" />
+	</form:form>
+	<!-- cont -->
+	<div class="cont_wrap" id="sub">
+		<div class="cont_tit">
+			<h2><c:out value="${brdMstrVO.bbsNm}"/></h2>
+			<div class="sns_go">
+			</div>
+		</div>
+		
+		<div class="list_view">
+			<div class="view_top">
+				<p class="view_title"><c:out value="${result.nttSj}" /></p>
+				<div class="view_info">
+					<p>날짜 <span><c:out value="${result.frstRegisterPnttm}" /></span></p>
+					<p>작성자 <span><c:out value="${result.ntcrNm}"/></span></p>
+					<p>조회수 <span><c:out value="${result.inqireCo}" /></span></p>
+				</div>
+			</div>
+			<div class="view_cont">
+				<p>
+					<c:if test="${'9620000' eq brdMstrVO.menuNo || '9650000' eq brdMstrVO.menuNo}">
+	            		<c:out value="${result.nttCn}"  />
+	            	</c:if>
+	            	<c:if test="${'9620000' ne brdMstrVO.menuNo && '9650000' ne brdMstrVO.menuNo}">
+	             	   <c:out value="${result.nttCn}"  escapeXml="false"/>
+	                </c:if>
+				</p>
+			</div>
+			<c:if test="${not empty result.atchFileId}">
+				<div class="file_list">
+					<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
+						<c:param name="param_atchFileId" value="${result.atchFileId}" />
+						<c:param name="pdf_view" value="Y" />
+					</c:import>
+				</div>
+			</c:if>				
+		</div>
+		<div class="btn_wrap btn_layout01">
+			<div class="btn_left">
+			</div>
+			<div class="btn_center">
+			</div>
+			<div class="btn_right">				
+				<button type="button" class="btnType02 m_btn_block" onclick="javascript:fn_egov_select_noticeList(); return false;">목록</button>
+			</div>
+		</div>
+		
+	</div>
+	<!-- //cont -->

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

@@ -11,10 +11,10 @@
 <un:useConstants var="VeConstants" className="kcc.ve.cmm.VeConstants" />
 <title>교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
-<%-- <spring:eval expression="@property['Globals.Innorix.License']" var="license"/> --%>
+<spring:eval expression="@property['Globals.Innorix.License']" var="license"/>
-<%-- <script src="<c:url value='/innorix/innorix_${license}.js' />"></script>  --%>
+<script src="<c:url value='/innorix/innorix_${license}.js' />"></script> 
-<%-- <script src="<c:url value='/js/kccadr/innorixCommon.js' />"></script> --%>
+<script src="<c:url value='/js/kccadr/innorixCommon.js' />"></script>
-<%-- <link rel="stylesheet" href="<c:url value='/innorix/innorix.css'/>" type="text/css"> --%>
+<link rel="stylesheet" href="<c:url value='/innorix/innorix.css'/>" type="text/css">
 <style>
 	input:disabled {
 		background-color: #f9f9f9 !important;
@@ -414,11 +414,9 @@ $(document).ready(function(){
 				<label for="searchStatus" class="label">신청상태 선택</label>
 				<select class="selType1" id="searchStatus" name="searchStatus">
 					<option ${vEPrcsDetailVO.searchStatus eq '' ? 'selected' : ''}  value="">전체</option>
-					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_SBMT ? 'selected' : ''} value="${VeConstants.STATUS_CD_SBMT}">교육신청</option>
+					<option ${vEPrcsDetailVO.searchStatus eq 10 ? 'selected' : ''} value="10">교육신청</option>
-					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_EDT_REQ ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDT_REQ}">수정요청</option>
+					<option ${vEPrcsDetailVO.searchStatus eq 30 ? 'selected' : ''} value="30">교육취소</option>
-					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_EDT_CMPT ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDT_CMPT}">수정완료</option>
+					<option ${vEPrcsDetailVO.searchStatus eq 20 ? 'selected' : ''} value="20">이수완료</option>
-					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_CAN ? 'selected' : ''} value="${VeConstants.STATUS_CD_CAN}">교육취소</option>
-					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_EDU_SELCT ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDU_SELCT}">교육확정</option>
 				</select>
 			</div>
 			<div class="btn_wrap">

src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp

@@ -744,7 +744,7 @@
 				<p>동반강사리스트</p>
 			</div>
 		</div>		
-				<div class="tb_list01">
+				<div class="tb_type02">
 					<table>
 						<colgroup>
 							<col style="width: 10%;">