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 3fc80333..2cce36fe 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
@@ -166,7 +166,11 @@
AND a0.code =a.aprvl_cd
)
AS aprvlCd
- , IF(A.APRVL_CD = '60', TO_CHAR(A.APRVL_PNTTM, 'YYYY.MM.DD'), '-') AS aprvlPnttm
+ /*
+ , IF(A.APRVL_CD = '60', TO_CHAR(A.APRVL_PNTTM, 'YYYY.MM.DD'), '-') AS aprvlPnttm
+ */
+
+ , CASE WHEN A.APRVL_CD = '60' THEN TO_CHAR(A.APRVL_PNTTM, 'YYYY.MM.DD') ELSE '-' END AS aprvlPnttm
, A.frst_Regist_Pnttm AS frstRegistPnttm
@@ -215,14 +219,17 @@
, A.ADMIN_UPDT_YN AS adminUpdtYn
,(
SELECT
- CASE WHEN COUNT(*) > 1 THEN S2.PRCS_NM || '외' || (COUNT(*)-1)
- ELSE S2.PRCS_NM END AS PRCS_NM
+ MAX(S2.PRCS_NM)||
+ CASE WHEN COUNT(*) > 1 THEN '외' || (COUNT(*)-1)
+ ELSE '' END AS PRCS_NM
FROM VE_EDU_APLCT_ONLN S1 INNER JOIN VE_PRCS S2
ON S1.PRCS_ORD = S2.PRCS_ORD
WHERE 1=1
AND S1.EDU_APLCT_ORD = A.EDU_APLCT_ORD
GROUP BY S1.EDU_APLCT_ORD
+ /*
ORDER BY S1.PRCS_ORD
+ */
) AS prcsGroupNm
, A.INSTT_DIV_CD AS insttDivCd
, A.FRST_REGISTER_ID AS frstRegisterId
@@ -335,6 +342,7 @@
, g.edu_strt_dt AS eduStrtDt
, g.edu_end_dt AS eduEndDt
+ /*
, IF(A.APRVL_CD='20'
and
(
@@ -346,17 +354,17 @@
INNER JOIN ve_prcs_onln_cntnt c0
ON c0.prcs_onln_cntnt_ord = a0.prcs_onln_cntnt_ord
WHERE 1 =1
- AND a0.edu_aplct_ord =A.EDU_APLCT_ORD
- /*
- AND IFNULL(a0.sbmt_yn,'N')='Y'
- */
+ AND a0.edu_aplct_ord =A.EDU_APLCT_ORD
AND NVL(a0.sbmt_yn,'N')='Y'
)>0
, g.edu_reg_dt
, ''
- ) AS eduRegDt
+ ) AS eduRegDt
+ */
+
+ /*
, IF(A.APRVL_CD='20'
and
(
@@ -368,36 +376,22 @@
INNER JOIN ve_prcs_onln_cntnt c0
ON c0.prcs_onln_cntnt_ord = a0.prcs_onln_cntnt_ord
WHERE 1 =1
- AND a0.edu_aplct_ord =A.EDU_APLCT_ORD
- /*
- AND IFNULL(a0.sbmt_yn,'N')='Y'
- */
+ AND a0.edu_aplct_ord =A.EDU_APLCT_ORD
AND NVL(a0.sbmt_yn,'N')='Y'
)>0
and length(g.edu_strt_dt)=8
and length(g.edu_end_dt)=8
- /*
- , CONCAT(
- SUBSTRING(g.edu_strt_dt,1,4), '.', SUBSTRING(g.edu_strt_dt,5,2), '.', SUBSTRING(g.edu_strt_dt,7,2)
- , '~'
- , SUBSTRING(g.edu_end_dt,1,4), '.', SUBSTRING(g.edu_end_dt,5,2), '.', SUBSTRING(g.edu_end_dt,7,2)
- )
- */
+
,
SUBSTRING(g.edu_strt_dt,1,4) || '.' || SUBSTRING(g.edu_strt_dt,5,2) || '.' || SUBSTRING(g.edu_strt_dt,7,2)
|| '~'
|| SUBSTRING(g.edu_end_dt,1,4) || '.' || SUBSTRING(g.edu_end_dt,5,2) || '.' || SUBSTRING(g.edu_end_dt,7,2)
- /*
- , CONCAT(
- DATE_FORMAT(TO_DATE(g.edu_strt_dt,'yyyymmdd'),'%Y.%m.%d')
- ,'~'
- , DATE_FORMAT(TO_DATE(g.edu_end_dt,'yyyymmdd'),'%Y.%m.%d')
- )
- */
+
, ''
- ) AS eduDt
+ ) AS eduDt
+ */
FROM VE_EDU_APLCT A LEFT OUTER JOIN (
SELECT
@@ -421,9 +415,18 @@
EDU_APLCT_ORD
,EDU_CHASI_ORD
,SUM(lrn_tm) AS lrn_tm
- ,MIN(REPLACE(IF(EDU_HOPE_DT IS NULL OR EDU_HOPE_DT = '', NULL, EDU_HOPE_DT), '.', '')) AS EDU_HOPE_DT
+ ,MIN(
+ REPLACE(
+ /*
+ IF(EDU_HOPE_DT IS NULL OR EDU_HOPE_DT = '', NULL, EDU_HOPE_DT)
+ */
+ CASE WHEN EDU_HOPE_DT IS NULL OR EDU_HOPE_DT = '' THEN NULL ELSE EDU_HOPE_DT END
+ , '.'
+ , ''
+ )
+ ) AS EDU_HOPE_DT
FROM VE_EDU_CHASI
- GROUP BY EDU_APLCT_ORD
+ GROUP BY EDU_APLCT_ORD, EDU_CHASI_ORD
) CC ON A.EDU_APLCT_ORD = CC.EDU_APLCT_ORD
LEFT OUTER JOIN COMVNUSERMASTER D
ON A.USER_ID = D.USER_ID
@@ -1014,6 +1017,7 @@
ROWNUM AS rowNo ,
aa.*
+ /*
, IF(aa.aprvlCd='20'
AND aa.isEndCnt > 0
and length(aa.eduStrtDt)=8
@@ -1026,7 +1030,14 @@
, ''
) AS eduDt
-
+ */
+
+ , CASE WHEN aa.aprvlCd='20' AND aa.isEndCnt > 0 and length(aa.eduStrtDt)=8 and length(aa.eduEndDt)=8
+ THEN SUBSTRING(aa.eduStrtDt,1,4) || '.' || SUBSTRING(aa.eduStrtDt,5,2) || '.' || SUBSTRING(aa.eduStrtDt,7,2)
+ || '~'
+ || SUBSTRING(aa.eduEndDt,1,4) || '.' || SUBSTRING(aa.eduEndDt,5,2) || '.' || SUBSTRING(aa.eduEndDt,7,2)
+ ELSE '' END
+ AS eduDt
FROM (
SELECT
@@ -1046,14 +1057,16 @@
c.email ,
/*이수과정명*/
- ( SELECT S2.PRCS_NM
+ ( SELECT MAX(S2.PRCS_NM)
FROM VE_EDU_APLCT_ONLN S1
INNER JOIN VE_PRCS S2
ON S1.PRCS_ORD = S2.PRCS_ORD
WHERE 1 =1
AND S1.EDU_APLCT_ORD = c.EDU_APLCT_ORD
GROUP BY S1.EDU_APLCT_ORD
+ /*
ORDER BY S1.PRCS_ORD
+ */
)
AS prcsGroupNm ,
@@ -1178,7 +1191,7 @@
- ORDER BY 1 =1
+ ORDER BY 1
/*
ORDER BY 1 =1
, AA.sbmtPnttm DESC
@@ -1192,7 +1205,10 @@
, $orderByQuery$
- LIMIT #recordCountPerPage# OFFSET #firstIndex#
+ /*
+ LIMIT recordCountPerPage OFFSET firstIndex
+ */
+ OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml
index 43b84501..29bd1c83 100644
--- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml
@@ -36,9 +36,9 @@
A.PRCS_NM AS prcsNm,
A.PRCS_CN AS prcsCn,
A.PRCS_SORT_NO AS prcsSortNo,
- DATE_FORMAT(A.FRST_REGIST_PNTTM,'%Y-%m-%d') AS frstRegistPnttm,
+ TO_CHAR(A.FRST_REGIST_PNTTM,'YYYY-MM-DD') AS frstRegistPnttm,
A.FRST_REGISTER_ID AS frstRegisterId,
- DATE_FORMAT(A.LAST_UPDT_PNTTM,'%Y-%m-%d') AS lastUpdtPnttm,
+ TO_CHAR(A.LAST_UPDT_PNTTM,'YYYY-MM-DD') AS lastUpdtPnttm,
A.LAST_UPDUSR_ID AS lastUpdusrId,
A.LCTR_DIV_CD AS lctrDivCd,
A.USE_YN AS useYn
@@ -68,6 +68,7 @@