From 626ad31678317e49802b658ab1e13d7c0d9f0883 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Fri, 13 Oct 2023 18:20:44 +0900
Subject: [PATCH] =?UTF-8?q?2023-10-13=2018:20=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asgnmInfo/service/VEInstrAsgnmVO.java        |  8 ++++++++
 .../sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml   |  1 +
 .../asgnmInfo/instrAsgnmRqstDetail.jsp           | 16 ++++++++++++----
 .../asgnmInfo/instrAsgnmRqstList.jsp             |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java
index dce1cc8f..a0dbbfe2 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java
@@ -146,6 +146,8 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable {
 	
 	private String yr; //강사 메모
 	
+	private String eduPlace;	//교육장소
+	
 	
 	public String getMemoCn() {
 		return memoCn;
@@ -735,5 +737,11 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable {
 	public void setPnltyOrd(String pnltyOrd) {
 		this.pnltyOrd = pnltyOrd;
 	}
+	public String getEduPlace() {
+		return eduPlace;
+	}
+	public void setEduPlace(String eduPlace) {
+		this.eduPlace = eduPlace;
+	}
 	
 }
diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml
index 4cc6b940..684ad5da 100644
--- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml
@@ -802,6 +802,7 @@
 			, a.end_tm				AS endTm
 			, a.lrn_tm				AS lrnTm
 			, b.edu_cn				AS eduCn
+			, b.edu_place			AS eduPlace
 			, a.trgt				AS trgt
 			, a.prsnl				AS prsnl
 			/*
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp
index 41d95371..cfb883ec 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp
@@ -117,7 +117,7 @@
 						<th scope="row">
 							<p>교육일시</p>
 						</th>
-						<td>${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일</td>
+						<td>${info.eduHopeDt}</td>
 						<th scope="row">
 							<p>차시</p>
 						</th>
@@ -131,7 +131,7 @@
 						<th scope="row">
 							<p>교육일시</p>
 						</th>
-						<td colspan="3">${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일</td>
+						<td colspan="3">${info.eduHopeDt}</td>
 					</tr>
 					<tr class="trLength2">
 						<th scope="row">
@@ -171,7 +171,7 @@
 						</th>
 						<td colspan="3">${info.addr}</td>
 					</tr>
-                          <tr>
+                    <tr>
 						<th scope="row">
 							<p>교육내용</p>
 						</th>
@@ -183,7 +183,15 @@
 							</c:forEach>
 						</td>
 					</tr>
-                          <tr class="trLength4">
+                    <tr>
+						<th scope="row">
+							<p>교육장소</p>
+						</th>
+						<td colspan="3">
+							${info.eduPlace}
+						</td>
+					</tr>					
+                    <tr class="trLength4">
 						<th scope="row">
 							<p>교육대상</p>
 						</th>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp
index 7d094c55..c1a62fc1 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp
@@ -130,7 +130,7 @@
 							</td>
 							<td>
 								<a href="javascript:fncGoDetail('<c:out value="${list.eduAplctOrd}"/>', '<c:out value="${list.eduChasiOrd}"/>');">
-									${fn:substring(list.eduHopeDt,0,4)}-${fn:substring(list.eduHopeDt,4,6)}-${fn:substring(list.eduHopeDt,6,8)}
+									${list.eduHopeDt}
 								</a>
 							</td>
 							<td>