Merge branch 'hylee' into advc

Conflicts:
	src/main/webapp/WEB-INF/jsp/main/EgovMainList.jsp

src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java

@@ -45,6 +45,7 @@ import kcc.com.cmm.spring.data.util.ExcelUtil;
 import kcc.com.cmm.util.IpUtil;
 import kcc.com.cmm.util.StringUtil;
 import kcc.com.utl.user.service.CheckLoginUtil;
+import kcc.let.uss.notify.service.NotifyManageService;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 import kcc.ve.cmm.VeConstants;
 import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduExcelVO;
@@ -128,6 +129,9 @@ public class OprtnAplctMngController {
 	@Resource(name = "vEPrcsAplctPrdService")
 	private VEPrcsAplctPrdService vEPrcsAplctPrdService;
 
+	@Resource(name = "NotifyManageService")
+	private NotifyManageService notifyManageService;
+
 	/**
 	 * 저작권체험교실 목록 화면
 	 */	
@@ -230,12 +234,15 @@ public class OprtnAplctMngController {
 	 */
 	@RequestMapping("oprtnAplctMngDetail.do")
 	public String oprtnAplctMngDetail( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpSession session, HttpServletRequest request ) throws Exception {
-    	
+
+		notifyManageService.updateNotifyChkWhereCmmNotifyOrd(vEEduAplctVO.getCmmNotifyOrd());
+		
 		LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
 		
 		//기본데이터 불러오기
     	vEEduAplctVO	=	vEEduAplctService.selectOprtnDetail(vEEduAplctVO);
     	
+    	
     	//데이터 복호화    - VO 단위로 만들어서 사용	
     	vEEduAplctVO	=	egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVO);    	
     	    	

src/main/webapp/WEB-INF/jsp/main/EgovMainList.jsp

@@ -109,7 +109,6 @@ function fn_goDetail(cmmNotifyOrd){
 							</colgroup>
 							<thead>
 								<tr>
-									<!-- <th scope="col">확인여부</th> -->
 									<th scope="col">분야</th>
 									<th scope="col">메세지</th>
 									<th scope="col">등록일</th>
@@ -130,6 +129,11 @@ function fn_goDetail(cmmNotifyOrd){
 				                    </td> --%>
 									<td>
 										<span class="new_icon">NEW</span><ve:code codeId="VE0011" code="${list.lctrDivCd}"/>	
+									<td>
+										<c:if test="${list.notifyChk ne 'Y'}">
+											<span class="new_icon">NEW</span>
+										</c:if>
+										<ve:code codeId="VE0011" code="${list.lctrDivCd}"/>	
 				                    </td>
 									<td>
 										<c:out value="${list.notifyCn}"/>