From ce546ea7bc6ac27e0f6724356a2570fcb70f8a38 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Fri, 23 Feb 2024 11:59:23 +0900
Subject: [PATCH] =?UTF-8?q?2024-02-23=2011:59=20=EC=B2=AD=EC=86=8C?=
 =?UTF-8?q?=EB=85=84=20=EC=B6=94=EA=B0=80=EA=B0=95=EC=9D=98=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml    | 15 ++++++++++++++-
 .../asgnmInfo/instrAsgnmAddRqstList.jsp           |  8 ++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

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 43dc8572..effb3e10 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
@@ -886,7 +886,18 @@
 			, b.end_oprtn_dt		AS endOprtnDt
 			, ((SUBSTR(a.end_tm, 1,2) - SUBSTR(a.strt_tm, 1,2)) * 60) + (SUBSTR(a.end_tm, 3,4) - SUBSTR(a.strt_tm, 3,4)) AS eduTM
 			, d.asgnm_aprvl_cd		AS asgnmAprvlCd
+			/*
 			, MAX(e.hstry_cd)			AS hstryCd
+			*/
+			, (
+				SELECT x.hstry_cd
+				FROM ve_edu_chasi_instr_asgnm_hstry x
+				WHERE x.edu_aplct_ord = a.edu_aplct_ord 
+					AND x.edu_chasi_ord = a.edu_chasi_ord
+					AND x.user_id = #userId#			
+				LIMIT 1 
+			  )	AS hstryCd
+				
 		FROM   ve_edu_chasi a
 			JOIN ve_edu_aplct b
 				ON     a.edu_aplct_ord = b.edu_aplct_ord
@@ -902,7 +913,9 @@
 					)
 			WHERE  a.edu_aplct_ord        = #eduAplctOrd#
 			AND    a.edu_chasi_ord        = #eduChasiOrd#
-			GROUP BY eduAplctOrd, eduChasiOrd, userId			
+			/*
+			GROUP BY eduAplctOrd, eduChasiOrd, userId
+			*/			
 			
 			
 	</select>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp
index 0c9b0a75..10e80431 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp
@@ -256,7 +256,7 @@
 				</thead>
 				<tbody>
 					<c:forEach var="list" items="${vEInstrAsgnmVOList}" varStatus="status">
-					<fmt:parseDate value="${list.eduHopeDt}" var="eduHopeDt" pattern="yyyyMMdd"/> <!-- 요일 구하기 -->
+					<fmt:parseDate value="${list.eduHopeDt}" var="eduHopeDt" pattern="yyyy.MM.dd"/> <!-- 요일 구하기 -->
 						
 						<c:choose>
 							<c:when test="${list.notiCnt == 0}">
@@ -287,7 +287,7 @@
 								</c:if>
 								</p>
 							</td>
-							<td><p>${fn:substring(list.eduHopeDt,0,4)}-${fn:substring(list.eduHopeDt,4,6)}-${fn:substring(list.eduHopeDt,6,8)}</p></td>
+							<td><p>${list.eduHopeDt}</p></td>
 							<td><p><fmt:formatDate value="${eduHopeDt}" pattern="E"/></p></td>
 							<td><p>
 								<fmt:parseDate value="${list.strtTm}" var="strtTm" pattern="kkmm"/><fmt:formatDate value="${strtTm}" pattern="kk:mm"/>
@@ -329,7 +329,7 @@
 
 		<div class="tb_list01_m">
 			<c:forEach var="list" items="${vEInstrAsgnmVOList}" varStatus="status">
-				<fmt:parseDate value="${list.eduHopeDt}" var="eduHopeDt" pattern="yyyyMMdd"/> <!-- 요일 구하기 -->
+				<fmt:parseDate value="${list.eduHopeDt}" var="eduHopeDt" pattern="yyyy.MM.dd"/> <!-- 요일 구하기 -->
 				<ul onclick="fncGoDetail('<c:out value="${list.eduAplctOrd}"/>', '<c:out value="${list.eduChasiOrd}"/>');">
 					<li>
 						<span>번호</span>
@@ -344,7 +344,7 @@
 					</li>
 					<li>
 						<span>교육일자</span>
-						<span>${fn:substring(list.eduHopeDt,0,4)}-${fn:substring(list.eduHopeDt,4,6)}-${fn:substring(list.eduHopeDt,6,8)}</span>
+						<span>${list.eduHopeDt}</span>
 					</li>
 					<li>
 						<span>요일</span>