From f560491f87c948546f30319358056182407cff92 Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Fri, 24 Nov 2023 14:10:35 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=B2=AD=EC=86=8C=EB=85=84=20=EA=B5=90?=
 =?UTF-8?q?=EC=9C=A1=EA=B2=B0=EA=B3=BC=EA=B4=80=EB=A6=AC=20>=20=EA=B2=B0?=
 =?UTF-8?q?=EA=B3=BC=EB=B3=B4=EA=B3=A0=20=EB=8B=A4=EC=9A=B4=EB=A1=9C?=
 =?UTF-8?q?=EB=93=9C=20=EC=A1=B0=EA=B1=B4=EC=A0=88=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml      | 17 ++++++++++++-----
 .../sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml |  6 +++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
index 2aaf30bc..60ef86fe 100644
--- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
@@ -4188,10 +4188,10 @@
 			AND a.aprvl_cd = '60'
 			AND NVL(A.USE_YN, 'Y') <![CDATA[ <> ]]> 'N'
 			<isNotEmpty property="searchStartDt">
-				AND b.EDU_HOPE_DT <![CDATA[ >= ]]> REPLACE(#searchStartDt#, '.' , '')
+				AND REPLACE(b.EDU_HOPE_DT, '.' , '') <![CDATA[ >= ]]> REPLACE(#searchStartDt#, '.' , '')
 			</isNotEmpty>
 			<isNotEmpty property="searchEndDt">
-				AND b.EDU_HOPE_DT <![CDATA[ <= ]]> REPLACE(#searchEndDt#, '.' , '')
+				AND REPLACE(b.EDU_HOPE_DT, '.' , '') <![CDATA[ <= ]]> REPLACE(#searchEndDt#, '.' , '')
 			</isNotEmpty>
 			<isNotEmpty property="searchStratAprvlPnttm">
 				AND TO_CHAR(A.APRVL_PNTTM, 'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchStratAprvlPnttm#, '.' , '')
@@ -4217,14 +4217,14 @@
 						)
 					)
 			</isNotEmpty>
-			<isEmpty property="searchCondition">
+			<isNotEmpty property="searchCondition">
 				<isNotEmpty property="searchKeyword">
 					AND (
 						A.SCHOL_INSTT_NM LIKE '%'||#searchKeyword#||'%' OR
 						A.INSTT_NM LIKE '%'||#searchKeyword#||'%'
 					)
 				</isNotEmpty>
-			</isEmpty>
+			</isNotEmpty>
 			
 			<isNotEmpty property="searchAsgnmAprvlCd">
 				<isEqual property="searchAsgnmAprvlCd" compareValue="90">
@@ -4267,7 +4267,14 @@
 	         ) > 0
 	         */
 		</isNotEmpty>			
-				
+		<isNotEmpty property="searchSubmitYn">	
+			<isEqual property="searchSubmitYn" compareValue="Y">
+				AND c.sbmt_yn = 'Y'
+			</isEqual>
+			<isEqual property="searchSubmitYn" compareValue="N">
+				AND (c.sbmt_yn != 'Y' or c.sbmt_yn is null) 
+			</isEqual>
+		</isNotEmpty>
 		ORDER BY
 			1
 			, b.edu_chasi_ord
diff --git a/src/main/resources/egovframework/sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml
index a225182e..fbc0d043 100644
--- a/src/main/resources/egovframework/sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml
@@ -70,12 +70,12 @@
 	<!-- 강사 등록 C -->
 	<insert id="VEEduRsltRprtDAO.insert" parameterClass="VEEduRprtVO">
 		
-		MERGE INTO <include refid="VEEduRsltRprtDAO.table_name"/> T1 USING DB_ROOT
+		MERGE INTO <include refid="VEEduRsltRprtDAO.table_name"/> T1 USING DUAL
 		ON (T1.EDU_APLCT_ORD = #eduAplctOrd# AND T1.EDU_CHASI_ORD = #eduChasiOrd#)
 		WHEN MATCHED THEN
 			UPDATE SET
-				edu_aplct_ord                      = #eduAplctOrd#,
-				edu_chasi_ord                      = #eduChasiOrd#,
+				<!-- edu_aplct_ord                      = #eduAplctOrd#,
+				edu_chasi_ord                      = #eduChasiOrd#, -->
 	
 				sbmt_yn                            = #sbmtYn#,
 				sbmt_pnttm                         = #sbmtPnttm#,