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') ]]> 'N' - AND b.EDU_HOPE_DT = ]]> REPLACE(#searchStartDt#, '.' , '') + AND REPLACE(b.EDU_HOPE_DT, '.' , '') = ]]> REPLACE(#searchStartDt#, '.' , '') - AND b.EDU_HOPE_DT REPLACE(#searchEndDt#, '.' , '') + AND REPLACE(b.EDU_HOPE_DT, '.' , '') REPLACE(#searchEndDt#, '.' , '') AND TO_CHAR(A.APRVL_PNTTM, 'YYYYMMDD') = ]]> REPLACE(#searchStratAprvlPnttm#, '.' , '') @@ -4217,14 +4217,14 @@ ) ) - + AND ( A.SCHOL_INSTT_NM LIKE '%'||#searchKeyword#||'%' OR A.INSTT_NM LIKE '%'||#searchKeyword#||'%' ) - + @@ -4267,7 +4267,14 @@ ) > 0 */ - + + + AND c.sbmt_yn = 'Y' + + + AND (c.sbmt_yn != 'Y' or c.sbmt_yn is null) + + 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 @@ - MERGE INTO T1 USING DB_ROOT + MERGE INTO 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#, + sbmt_yn = #sbmtYn#, sbmt_pnttm = #sbmtPnttm#,