From 871a56f177aa9bc82e33cd40e8b286023c9e7edf Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Fri, 8 Mar 2024 17:56:37 +0900
Subject: [PATCH] =?UTF-8?q?2024-03-08=2017:56=20=EC=84=B1=EC=9D=B8=20?=
 =?UTF-8?q?=EA=B0=95=EC=82=AC=20=EA=B8=88=EC=95=A1=20=EC=82=AC=EC=A0=84=20?=
 =?UTF-8?q?=EA=B3=84=EC=82=B0=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml       | 24 +++++++++++++++
 .../asgnmInfo/instrAsgnmList.jsp              | 25 +++++++++-------
 .../asgnmInfo/instrAsgnmRqstList.jsp          | 30 +++++++++----------
 3 files changed, 53 insertions(+), 26 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 25209e7c..2656631d 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
@@ -300,6 +300,17 @@
 			eduSlctCd ,
 			cnt,
 			notiCnt
+			,		(
+						SELECT
+							x.div_cd
+						FROM
+							ve_instr_detail x
+						WHERE
+							x.user_id=userId
+							AND x.use_yn='Y'
+						ORDER BY x.instr_detail_ord desc
+						LIMIT 1
+						) AS divCd
 		from
 			 ( SELECT a.user_id          AS userId ,
 					a.edu_aplct_ord     AS eduAplctOrd ,
@@ -656,6 +667,19 @@
 			,insttNm
 			,cnt
 			,notiCnt
+			
+			,		(
+						SELECT
+							x.div_cd
+						FROM
+							ve_instr_detail x
+						WHERE
+							x.user_id=userId
+							AND x.use_yn='Y'
+						ORDER BY x.instr_detail_ord desc
+						LIMIT 1
+						) AS divCd			
+			
 		FROM
 			( SELECT  
 				 a.user_id				AS userId
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp
index 481f77fd..7ce97f11 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp
@@ -134,19 +134,22 @@
 
 							<td><p>
 							
-									<c:set var = "fee" value="" />
-									<c:choose>
-										<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
-											정산중
-										</c:when>
-										<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}">
-											정산중
-										</c:when>
-										<c:otherwise>
+<%-- 									<c:set var = "fee" value="" /> --%>
+<%-- 									<c:choose> --%>
+<%-- 										<c:when test="${list.instrFeeSbmtYn ne 'Y'}"> --%>
+<!-- 											정산중 -->
+<%-- 										</c:when> --%>
+<%-- 										<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}"> --%>
+<!-- 											정산중 -->
+<%-- 										</c:when> --%>
+<%-- 										<c:otherwise> --%>
+<%-- 											<c:set var = "fee" value="${list.feeSum4Dp}" />		 --%>
+<%-- 											<fmt:formatNumber value="${fee}" pattern="#,###"/> --%>
+<%-- 										</c:otherwise> --%>
+<%-- 									</c:choose> --%>
+
 											<c:set var = "fee" value="${list.feeSum4Dp}" />		
 											<fmt:formatNumber value="${fee}" pattern="#,###"/>
-										</c:otherwise>
-									</c:choose>
 							
 							</p></td>
 						</tr>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp
index 9700987d..ac3aaec8 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp
@@ -174,22 +174,22 @@
 
 							<td><p>
 							
-									<c:set var = "fee" value="" />
-									<c:choose>
-										<c:when test="${list.instrFeeSbmtYn ne 'Y'}">
-											정산중
-										</c:when>
-										<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}">
-											정산중
-										</c:when>
-										<c:otherwise>
-											<c:set var = "fee" value="${list.feeSum4Dp}" />		
-											<fmt:formatNumber value="${fee}" pattern="#,###"/>
-										</c:otherwise>
-									</c:choose>		
-									
+<%-- 									<c:set var = "fee" value="" /> --%>
+<%-- 									<c:choose> --%>
+<%-- 										<c:when test="${list.instrFeeSbmtYn ne 'Y'}"> --%>
+<!-- 											정산중 -->
+<%-- 										</c:when> --%>
+<%-- 										<c:when test="${list.acmdtSbmtYn eq 'Y' and empty list.acmdtAprvlCd}"> --%>
+<!-- 											정산중 -->
+<%-- 										</c:when> --%>
+<%-- 										<c:otherwise> --%>
 <%-- 											<c:set var = "fee" value="${list.feeSum4Dp}" />		 --%>
-<%-- 											<fmt:formatNumber value="${fee}" pattern="#,###"/>																						 --%>
+<%-- 											<fmt:formatNumber value="${fee}" pattern="#,###"/> --%>
+<%-- 										</c:otherwise> --%>
+<%-- 									</c:choose>		 --%>
+									
+											<c:set var = "fee" value="${list.feeSum4Dp}" />		
+											<fmt:formatNumber value="${fee}" pattern="#,###"/>																						
 							
 							</p></td>