From ff9e98b833dcfb9b68bcf8e0873427fe9dac6fdc Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Mon, 1 Jul 2024 17:57:47 +0900
Subject: [PATCH] =?UTF-8?q?2024-07-01=2017:56=20=EB=B3=91=ED=95=A9=20?=
 =?UTF-8?q?=EB=8C=80=EC=83=81=EC=9D=98=20=EA=B2=BD=EC=9A=B0=20=EA=B5=90?=
 =?UTF-8?q?=EC=9C=A1=20=EC=83=81=ED=83=9C=EB=A5=BC=20=EB=B3=91=ED=95=A9?=
 =?UTF-8?q?=EB=90=9C=20=EC=83=81=EC=9C=84=EA=B0=92=EC=9D=84=20=EB=94=B0?=
 =?UTF-8?q?=EB=A5=B4=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml  | 31 +++++++++++++++++--
 .../jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp     |  3 +-
 .../jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp  |  3 +-
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml
index 27a7e28d..8365aa8d 100644
--- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml
@@ -440,14 +440,41 @@
 		SELECT
 			 COUNT(1) OVER() AS totCnt,
 			<include refid="CndtnTrgtInfoMngDAO.select_column_name"/>
-			
+
+			, CASE
+    				WHEN a.prcs_aplct_prd_ord_cmplt IS NOT NULL THEN 
+    				(
+						SELECT
+							CODE_NM
+						FROM
+							LETTCCMMNDETAILCODE
+						WHERE
+							USE_AT = 'Y'
+							AND CODE_ID = 'VEA002'
+							AND CODE = (SELECT b.edu_state_cd
+										FROM vea_sspn_idmt_trgt b
+										WHERE b.sspn_idtmt_trgt_ord=a.prcs_aplct_prd_ord_cmplt							
+										)		    				
+    				) 
+    				
+    				ELSE (
+					       SELECT CODE_NM 
+					       FROM LETTCCMMNDETAILCODE
+					        WHERE USE_AT = 'Y'
+					          AND CODE_ID = 'VEA002'
+					          AND CODE = a.edu_state_cd
+           			)
+    			END	AS eduStateCdNm
+    						
+			/*
 			, (
 			       SELECT CODE_NM 
 			       FROM LETTCCMMNDETAILCODE
 			        WHERE USE_AT = 'Y'
 			          AND CODE_ID = 'VEA002'
 			          AND CODE = a.edu_state_cd
-			          ) AS eduStateCdNm	
+			          ) AS eduStateCdNm
+			*/	
 			          
 			, CASE
     				WHEN a.prcs_aplct_prd_ord_cmplt IS NOT NULL THEN '병합처리' 
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp
index c9bc2f53..c1ee9c7d 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp
@@ -788,7 +788,8 @@
 								</td>								
 								
 								<td>									
-									<ve:code codeId="VEA002" code="${list.eduStateCd }"/>  		
+<%-- 									<ve:code codeId="VEA002" code="${list.eduStateCd }"/>  		 --%>
+										${list.eduStateCdNm }
 								</td>
 								<c:set var="fullAddr" value="${list.addr} ${list.addrDetail}" />
 <%-- 								<c:set var="fullAddr" value="${list.addr}" /> --%>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp
index 5620fd4c..1af563b5 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp
@@ -888,7 +888,8 @@
 									</c:if>	
 								</td>
 								<td><!-- 교육상태 -->
-									<ve:code codeId="VEA002" code="${list.eduStateCd }"/>  		
+<%-- 									<ve:code codeId="VEA002" code="${list.eduStateCd }"/> --%>
+									${list.eduStateCdNm }  		
 								</td>
 								<c:set var="fullAddr" value="${list.addr} ${list.addrDetail}" />
 <%-- 								<c:set var="fullAddr" value="${list.addr}" /> --%>