tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'JIWOO' into advc

Browse Source
This commit is contained in:
jiwoo 2023-11-24 14:15:37 +09:00
commit a7d84a7a17
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
View File

@ -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

6
src/main/resources/egovframework/sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml
View File

@ -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#,