2024-07-01 17:56 병합 대상의 경우 교육 상태를 병합된 상위값을 따르도록 수정

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 '병합처리' 

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}" /> --%>

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}" /> --%>