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

src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp

@@ -245,11 +245,15 @@ function usrJoin(){
 					</button> --%>
 					
 					<div class="area_right">
-						<!-- e배움터 로그인 연동으로 인하여 로컬, 운영 구분 -->
+							<p class="login_after"><c:out value="${LoginVO.id}"/><span>님</span></p>
-						<c:if test="${environment eq 'local'}">
+							<!-- e배움터 로그인 연동으로 인하여 개발, 운영 구분 -->
-							<p class="login_after"><c:out value="${ssoLoginVO.membName}"/><span>님</span></p>
+							<c:if test="${environment eq 'real' }">
-							<p class="login_info"><a href="#" onclick="javascript:usrModify();" title="새창열림">회원정보 수정</a></p>
+								<p class="login_info"><a href="https://edu-copyright.or.kr/user/member/loginForm.do" title="새창열림">회원정보 수정</a></p>
-						</c:if>
+							</c:if>
+							<c:if test="${environment ne 'real' }">
+								<p class="login_info"><a href="http://223.255.205.7/user/member/loginForm.do" title="새창열림">회원정보 수정</a></p>
+							</c:if>
+							
 							<p class="login_info"><a href="#" onclick="location.href='${pageContext.request.contextPath}/web/uat/uia/actionLogout.do'">로그아웃</a></p>
 						<div class="btn_util">
 							<button class="btn_minus" onClick="zoomOut();" title="글자 확대"></button>

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

@@ -64,7 +64,7 @@
 					<c:choose>
 						<c:when test="${not empty info.sbmtPnttmDetail}">
 							<fmt:parseDate value="${info.sbmtPnttmDetail}" var="sbmtPnttm" pattern="yyyy-MM-dd HH:mm:ss"/>
-							<fmt:formatDate value="${sbmtPnttm}" pattern="yyyy.MM.dd HH시 mm분"/>
+							<fmt:formatDate value="${sbmtPnttm}" pattern="yyyy-MM-dd HH시 mm분"/>
 						</c:when>
 						<c:otherwise>
 							-
@@ -76,7 +76,7 @@
 					<p>접수종료일</p>
 				</th>
 				<td>
-					<c:out value="${endPnttm }"/>
+					<c:out value="${endPnttm}"/>
 				</td>
 			</tr>
 			<tr class="trLength2">
@@ -87,7 +87,7 @@
 					<c:choose>
 						<c:when test="${not empty info.sbmtPnttm}">
 							<fmt:parseDate value="${info.sbmtPnttm}" var="sbmtPnttm" pattern="yyyy-MM-dd"/>
-							<fmt:formatDate value="${sbmtPnttm}" pattern="20yy.MM.dd"/>
+							<fmt:formatDate value="${sbmtPnttm}" pattern="20yy-MM-dd"/>
 						</c:when>
 						<c:otherwise>
 							-
@@ -102,8 +102,7 @@
 				<td colspan="3">
 					<c:choose>
 						<c:when test="${not empty info.endPnttm}">
-							<fmt:parseDate value="${info.endPnttm}" var="endPnttm" pattern="yyyyMMddHHmm"/>
+							<c:out value="${endPnttm}"/>
-							<fmt:formatDate value="${endPnttm}" pattern="yyyy.MM.dd"/>
 						</c:when>
 						<c:otherwise>
 							-

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

@@ -150,7 +150,7 @@
 					<c:choose>
 						<c:when test="${not empty info.sbmtPnttmDetail}">
 							<fmt:parseDate value="${info.sbmtPnttmDetail}" var="sbmtPnttm" pattern="yyyy-MM-dd HH:mm:ss"/>
-							<fmt:formatDate value="${sbmtPnttm}" pattern="yyyy.MM.dd HH시 mm분"/>
+							<fmt:formatDate value="${sbmtPnttm}" pattern="yyyy-MM-dd HH시 mm분"/>
 						</c:when>
 						<c:otherwise>
 							-
@@ -173,7 +173,7 @@
 					<c:choose>
 						<c:when test="${not empty info.sbmtPnttm}">
 							<fmt:parseDate value="${info.sbmtPnttm}" var="sbmtPnttm" pattern="yyyy-MM-dd"/>
-							<fmt:formatDate value="${sbmtPnttm}" pattern="20yy.MM.dd"/>
+							<fmt:formatDate value="${sbmtPnttm}" pattern="20yy-MM-dd"/>
 						</c:when>
 						<c:otherwise>
 							-
@@ -187,9 +187,8 @@
 				</th>
 				<td colspan="3">
 					<c:choose>
-						<c:when test="${not empty info.endPnttm}">
+						<c:when test="${not empty endPnttm}">
-							<fmt:parseDate value="${info.endPnttm}" var="endPnttm" pattern="yyyyMMddHHmm"/>
+							<c:out value="${endPnttm }"/>
-							<fmt:formatDate value="${endPnttm}" pattern="yyyy.MM.dd"/>
 						</c:when>
 						<c:otherwise>
 							-

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

@@ -218,8 +218,7 @@
 						<li>
 							<span>접수종료일</span>
 							<span>
-								<fmt:parseDate value="${list.endPnttm}" var="endPnttm" pattern="yyyyMMddHHmm"/>
+								<c:out value="${list.endPnttm }"/>
-								<fmt:formatDate value="${endPnttm}" pattern="yyyy.MM.dd"/>
 							</span>
 						</li>
 						<li>