From c5614e49368d8292b7adf20d378f518fba4d19e2 Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 12 Sep 2023 15:57:57 +0900 Subject: [PATCH] =?UTF-8?q?2023-09-12=2015:57=20=EC=BF=BC=EB=A6=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prcsInfo/service/VEPrcsDetailVO.java | 6 +- .../sym/mnu/mcm/EgovMenuCreat_SQL_Tibero.xml | 18 +- .../let/uss/ion/cnt/CntManage_SQL_Tibero.xml | 14 +- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 236 ++++++++++-------- .../ve/instr/VEInstrDetail_SQL_Tibero.xml | 23 +- .../ve/instr/VEInstr_MIX_SQL_Tibero.xml | 66 +++-- .../ve/lctr/VELctrRsrchMng_SQL_Tibero.xml | 47 ++-- .../sqlmap/ve/lctr/VELctr_MIX_SQL_Tibero.xml | 30 ++- .../ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 34 ++- .../sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml | 27 +- .../ve/sttst/VESttst_MIX_SQL_Tibero.xml | 135 +++++----- 11 files changed, 390 insertions(+), 246 deletions(-) diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java index 843d8a16..7038f7e4 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java @@ -105,7 +105,7 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String deadLineDt; private String eduPartCd; - private int nos; + private String nos; private String ddlnCd; private String nosCnt1; //신청인 @@ -513,10 +513,10 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setEduPartCd(String eduPartCd) { this.eduPartCd = eduPartCd; } - public int getNos() { + public String getNos() { return nos; } - public void setNos(int nos) { + public void setNos(String nos) { this.nos = nos; } public String getDdlnCd() { diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Tibero.xml index 8d806519..786d8988 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Tibero.xml @@ -49,6 +49,7 @@ + /* menuManageDAO.selectMenuCreatCnt_S */ + /* menuManageDAO.selectUsrByPk */ - /* 임시.*NOT_SQL_LOG.* */ + /* 임시.*NOT_SQL_LOG.* menuManageDAO.selectMenuListJtree */ - /* 임시.*NOT_SQL_LOG.* */ + /* 임시.*NOT_SQL_LOG.* menuManageDAO.selectMenuListJtreeWeb_bak_2022_0215 */ - /* 임시.*NOT_SQL_LOG.* */ + /* 임시.*NOT_SQL_LOG.* menuManageDAO.selectMenuListCurrentJtreeWeb_bak */ - /* 임시.*NOT_SQL_LOG.* */ + /* 임시.*NOT_SQL_LOG.* menuManageDAO.selectQuickListJtree */ - /* 임시.*NOT_SQL_LOG.* */ + /* 임시.*NOT_SQL_LOG.* menuManageDAO.selectQuickListIncTop */ AND A.USE_AT = 'Y' - ORDER BY 1=1 + ORDER BY 1 ,$searchSortCnd$ $searchSortOrd$ - LIMIT #recordCountPerPage# OFFSET #firstIndex# + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; @@ -91,7 +94,7 @@ A.CNT_CN cntCn , A.CNT_NAME cntName, B.EMPLYR_ID registerId, - DATE_FORMAT(A.REGIST_PNTTM , '%Y-%m-%d %T') registPnttm + TO_CHAR(A.REGIST_PNTTM , 'YYYY-MM-DD HH24') registPnttm FROM CNT_MANAGE A LEFT JOIN LETTNEMPLYRINFO B ON A.REGISTER_ID = B.ESNTL_ID WHERE 1=1 @@ -131,7 +134,10 @@ AND USE_AT = #useAt# ORDER BY CNTDT_ID DESC - LIMIT #recordCountPerPage# OFFSET #firstIndex# + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; + /* VEEduMIXDAO.selectDetail */ SELECT FROM @@ -117,6 +118,7 @@ - + /* VEEduMIXDAO.selectPagingList_20230607 */ SELECT COUNT(1) OVER() AS totCnt , ROWNUM AS rowNo , @@ -1017,11 +1019,11 @@ and length(aa.eduStrtDt)=8 and length(aa.eduEndDt)=8 - , CONCAT( - 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) - ) + , + 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) + , '' ) AS eduDt @@ -1064,7 +1066,7 @@ ON c0.prcs_onln_cntnt_ord = a0.prcs_onln_cntnt_ord WHERE 1 =1 AND a0.edu_aplct_ord =c.EDU_APLCT_ORD - AND IFNULL(a0.sbmt_yn,'N') ='Y' + AND NVL(a0.sbmt_yn,'N') ='Y' ) AS isEndCnt @@ -1130,7 +1132,7 @@ FROM ve_edu_aplct c WHERE 1 =1 - AND IFNULL(C.USE_YN, 'Y') = 'Y' + AND NVL(C.USE_YN, 'Y') = 'Y' AND C.SBMT_YN = 'Y' AND C.LCTR_DIV_CD = '40' @@ -1152,8 +1154,8 @@ /*교육콘텐츠 신청자 검색*/ AND ( - C.FULL_NAME like concat('%', #searchFullName#, '%') - OR C.BLNG like concat('%', #searchFullName#, '%') + C.FULL_NAME like '%' || #searchFullName# || '%' + OR C.BLNG like '%' || #searchFullName# || '%' ) @@ -1198,6 +1200,7 @@ - + /* VEEduMIXDAO.selectTngrRsltPagingList */ SELECT AA.*, 2 , @@ -1271,7 +1274,7 @@ FROM ( SELECT a.edu_aplct_ord AS eduAplctOrd , - DATE_FORMAT(a.aprvl_pnttm,'%Y-%m-%d') AS aprvlPnttm , + TO_CHAR(a.aprvl_pnttm,'YYYY-MM-DD') AS aprvlPnttm , a.edu_slct_cd AS eduSlctCd , a.edu_slct_area_cd AS eduSlctAreaCd , a.schol_instt_nm AS scholInsttNm , @@ -1294,7 +1297,7 @@ b.trgt AS trgt , b.prsnl AS eduPrsnl , b.div_cd AS lctrDivCd , - IFNULL(b.chasi, 0) AS chasi, + NVL(b.chasi, 0) AS chasi, c.sbmt_yn AS sbmtYn , d.user_id AS userId , d.asgnm_aprvl_cd AS asgnmAprvlCd, @@ -1336,7 +1339,7 @@ ) AS notiCnt , h.oneway_dstnc AS onewayDstnc - ,IFNULL(( + ,NVL(( SELECT COUNT(1) FROM @@ -1416,7 +1419,7 @@ ON b.edu_aplct_ord = h.edu_aplct_ord AND d.user_id = h.user_id WHERE 1=1 AND a.edu_aplct_ord=b.edu_aplct_ord - AND IFNULL(A.USE_YN, 'Y') ]]> 'N' + AND NVL(A.USE_YN, 'Y') ]]> 'N' AND a.LCTR_DIV_CD = #lctrDivCd# @@ -1495,40 +1498,40 @@ - AND AA.scholInsttNm LIKE CONCAT('%' , #searchScholNm# , '%') + AND AA.scholInsttNm LIKE '%' || #searchScholNm# || '%' - AND AA.insttNm LIKE CONCAT('%' , #searchInsttNm# , '%') + AND AA.insttNm LIKE '%' || #searchInsttNm# || '%' - AND AA.instrNm LIKE CONCAT('%' , #searchInstrNm# , '%') + AND AA.instrNm LIKE '%' || #searchInstrNm# || '%' AND ( - A.SCHOL_INSTT_NM LIKE CONCAT('%' , #searchKeyword# , '%') OR - A.INSTT_NM LIKE CONCAT('%' , #searchKeyword# , '%') + A.SCHOL_INSTT_NM LIKE '%' || #searchKeyword# || '%' OR + A.INSTT_NM LIKE '%' || #searchKeyword# || '%' ) - AND (AA.scholInsttNm LIKE CONCAT('%', #searchKeyword#,'%') OR AA.instrNm LIKE CONCAT('%', #instrNm#,'%')) + AND (AA.scholInsttNm LIKE '%' || #searchKeyword# || '%' OR AA.instrNm LIKE '%' || #instrNm# || '%') - AND AA.scholInsttNm LIKE CONCAT('%', #searchKeyword#,'%') + AND AA.scholInsttNm LIKE '%' || #searchKeyword# || '%' - AND AA.instrNm LIKE CONCAT('%', #instrNm#,'%') + AND AA.instrNm LIKE '%' || #instrNm# || '%' - AND (AA.insttNm LIKE CONCAT('%', #searchKeyword#,'%') OR AA.instrNm LIKE CONCAT('%', #searchKeyword#,'%')) + AND (AA.insttNm LIKE '%' || #searchKeyword# || '%' OR AA.instrNm LIKE '%' || #searchKeyword# || '%') - AND AA.insttNm LIKE CONCAT('%', #searchKeyword#,'%') + AND AA.insttNm LIKE '%' || #searchKeyword# || '%' - ORDER BY 1=1 + ORDER BY 1 , eduAplctOrd desc, eduChasiOrd @@ -1537,22 +1540,28 @@ , $orderByQuery$ - LIMIT #recordCountPerPage# OFFSET #firstIndex# + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; - + /* VEEduMIXDAO.selectTngrRsltPagingList4Excel */ SELECT AA.*, 2 , - IF(aa.userId IS NOT null, CONCAT('(',SUBSTRING(aa.userId,INSTR(aa.userId,'_')+1)*1,')'),'') AS userIdNum, + IF(aa.userId IS NOT null + , '('||SUBSTRING(aa.userId,INSTR(aa.userId,'_')+1)*1||')' + ,'' + ) AS userIdNum, COUNT(1) OVER() AS totCnt FROM ( SELECT @@ -1837,11 +1849,11 @@ /* b.end_tm AS endTm , */ - CONCAT(b.strt_tm,'~',b.end_tm) AS endTm , + b.strt_tm||'~'||b.end_tm AS endTm , b.trgt AS trgt , b.prsnl AS eduPrsnl , b.div_cd AS lctrDivCd , - IFNULL(b.chasi, 0) AS chasi, + NVL(b.chasi, 0) AS chasi, c.sbmt_yn AS sbmtYn , d.user_id AS userId , /* @@ -1878,7 +1890,7 @@ ) AS notiCnt , h.oneway_dstnc AS onewayDstnc - ,IFNULL(( + ,NVL(( SELECT COUNT(1) FROM @@ -1948,7 +1960,7 @@ ON b.edu_aplct_ord = h.edu_aplct_ord AND d.user_id = h.user_id WHERE 1=1 AND a.edu_aplct_ord=b.edu_aplct_ord - AND IFNULL(A.USE_YN, 'Y') ]]> 'N' + AND NVL(A.USE_YN, 'Y') ]]> 'N' AND a.LCTR_DIV_CD = #lctrDivCd# @@ -2015,34 +2027,34 @@ - AND AA.scholInsttNm LIKE CONCAT('%' , #searchScholNm# , '%') + AND AA.scholInsttNm LIKE '%'||#searchScholNm#||'%' - AND AA.insttNm LIKE CONCAT('%' , #searchInsttNm# , '%') + AND AA.insttNm LIKE '%'||#searchInsttNm#||'%' AND ( - A.SCHOL_INSTT_NM LIKE CONCAT('%' , #searchKeyword# , '%') OR - A.INSTT_NM LIKE CONCAT('%' , #searchKeyword# , '%') + A.SCHOL_INSTT_NM LIKE '%'||#searchKeyword#||'%' OR + A.INSTT_NM LIKE '%'||#searchKeyword#||'%' ) - AND (AA.scholInsttNm LIKE CONCAT('%', #searchKeyword#,'%') OR AA.instrNm LIKE CONCAT('%', #searchKeyword#,'%')) + AND (AA.scholInsttNm LIKE '%'||#searchKeyword#||'%' OR AA.instrNm LIKE '%'||#searchKeyword#||'%') - AND AA.scholInsttNm LIKE CONCAT('%', #searchKeyword#,'%') + AND AA.scholInsttNm LIKE '%'||#searchKeyword#||'%' - AND AA.instrNm LIKE CONCAT('%', #searchKeyword#,'%') + AND AA.instrNm LIKE '%'||#searchKeyword#||'%' - AND (AA.insttNm LIKE CONCAT('%', #searchKeyword#,'%') OR AA.instrNm LIKE CONCAT('%', #searchKeyword#,'%')) + AND (AA.insttNm LIKE '%'||#searchKeyword#||'%' OR AA.instrNm LIKE '%'||#searchKeyword#||'%') - AND AA.insttNm LIKE CONCAT('%', #searchKeyword#,'%') + AND AA.insttNm LIKE '%'||#searchKeyword#||'%' ORDER BY 1=1 @@ -2060,6 +2072,7 @@ + /* VEEduMIXDAO.selectAdultChasiList */ SELECT A.EDU_APLCT_ORD AS eduAplctOrd , A.LCTR_DIV_CD AS lctrDivCd @@ -2323,7 +2337,7 @@ AND C0.USER_ID = h.user_id ) WHERE 1=1 - AND IFNULL(A.USE_YN, 'Y') ]]> 'N' + AND NVL(A.USE_YN, 'Y') ]]> 'N' AND A.EDU_APLCT_ORD = B.EDU_APLCT_ORD AND A.EDU_APLCT_ORD = #eduAplctOrd# @@ -2351,6 +2365,7 @@ + /* VEEduMIXDAO.selectAplctDuplCnt */ SELECT COUNT(1) FROM @@ -2676,12 +2698,13 @@ VALUES AND B.trgt = #trgt# AND - IFNULL(A.USE_YN, 'Y') ]]> 'N' + NVL(A.USE_YN, 'Y') ]]> 'N' AND A.LCTR_DIV_CD = #lctrDivCd# + /* VEEduMIXDAO.selectSatisfactionExcelList */ SELECT - CONCAT(substring(bbbb.edu_hope_dt,1,4), '-', substring(bbbb.edu_hope_dt,5,2), '-', substring(bbbb.edu_hope_dt,7,2)) AS eduHopeDt + substring(bbbb.edu_hope_dt,1,4)|| '-'|| substring(bbbb.edu_hope_dt,5,2)|| '-'|| substring(bbbb.edu_hope_dt,7,2) AS eduHopeDt , cccc.schol_instt_nm AS scholInsttNm , eeee.instr_nm AS instrNm , IF(vals=0,'',vals) AS valss @@ -2740,7 +2764,7 @@ VALUES */ SELECT EDU_APLCT_ORD , EDU_CHASI_ORD - , CONCAT(nos,'') AS nos + , nos||'' AS nos , 6-nos vals , SUM( IF (qestnSn=1 @@ -3314,7 +3338,7 @@ VALUES AND eeee.use_yn='Y' AND eeee.instr_div='10' - AND IFNULL(cccc.use_yn,'Y')='Y' + AND NVL(cccc.use_yn,'Y')='Y' AND cccc.aprvl_cd='60' AND cccc.lctr_div_cd='10' diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml index d4cedb9a..a6641455 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml @@ -75,7 +75,10 @@ /* a.d_birth AS Birth, */ + /* IF (length(a.d_birth)=8,DATE_FORMAT(STR_TO_DATE(a.d_birth, '%Y%m%d'),'%Y-%m-%d'),IF (length(a.d_birth)=6,DATE_FORMAT(STR_TO_DATE(a.d_birth, '%y%m%d'),'%Y-%m-%d'),'')) AS Birth, + */ + '' AS Birth, a.final_schol AS finalSchol, a.mjr AS mjr, a.appt_yr AS apptYr, @@ -90,14 +93,14 @@ a.sbmt_pnttm AS sbmtPnttm, a.aprvl_cd AS aprvlCd, - DATE_FORMAT(a.aprvl_pnttm,'%Y-%m-%d') AS aprvlPnttm, + TO_CHAR(a.aprvl_pnttm,'YYYY-MM-DD') AS aprvlPnttm, a.aprvl_id AS aprvlId, a.aprvl_cn AS aprvlCn, - 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, @@ -304,7 +307,7 @@ + /* VEInstrDetailDAO.selectList */ SELECT FROM @@ -450,6 +454,7 @@ @@ -521,6 +529,7 @@ + /* VEInstrMixDAO.selectDetail */ SELECT FROM @@ -145,6 +146,7 @@ + /* VEInstrMixDAO.selectDetailForCheck */ SELECT FROM @@ -174,6 +177,7 @@ + /* VEInstrMixDAO.selectStngGetMaxOrd */ SELECT instr_div AS instrDiv , user_id AS userId @@ -200,6 +205,7 @@ + /* VEInstrMixDAO.selectStngGetY */ SELECT instr_div AS instrDiv , user_id AS userId @@ -234,6 +241,7 @@ + /* VEInstrMixDAO.selectPagingList */ + /* VEInstrMixDAO.selectPagingDetailList */ SELECT COUNT(1) OVER() AS totCnt , , @@ -694,7 +705,7 @@ - ORDER BY 1=1 + ORDER BY 1 , b.user_id desc @@ -704,12 +715,17 @@ - LIMIT #recordCountPerPage# OFFSET #firstIndex# + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; + /* VEInstrMixDAO.selectUploadInfoDetail */ SELECT FROM @@ -769,6 +786,7 @@ + /* VEInstrMixDAO.selectEduPrfrmInfo */ SELECT aaaa.edu_hope_yr AS eduHopeYr /* , aaaa.div_cd AS divCd @@ -1102,6 +1122,21 @@ ELSE '합계' END AS chasi + , CASE WHEN aaaa.no3='20' THEN bbbb.mnt01 ELSE bbbb.cnt01 END mnt01 + , CASE WHEN aaaa.no3='20' THEN bbbb.mnt02 ELSE bbbb.cnt02 END mnt02 + , CASE WHEN aaaa.no3='20' THEN bbbb.mnt03 ELSE bbbb.cnt03 END mnt03 + , CASE WHEN aaaa.no3='20' THEN bbbb.mnt04 ELSE bbbb.cnt04 END mnt04 + , CASE WHEN aaaa.no3='20' THEN bbbb.mnt05 ELSE bbbb.cnt05 END mnt05 + , CASE WHEN aaaa.no3='20' THEN bbbb.mnt06 ELSE bbbb.cnt06 END mnt06 + , CASE WHEN aaaa.no3='20' THEN bbbb.mnt07 ELSE bbbb.cnt07 END mnt07 + , CASE WHEN aaaa.no3='20' THEN bbbb.mnt08 ELSE bbbb.cnt08 END mnt08 + , CASE WHEN aaaa.no3='20' THEN bbbb.mnt09 ELSE bbbb.cnt09 END mnt09 + , CASE WHEN aaaa.no3='20' THEN bbbb.mnt10 ELSE bbbb.cnt10 END mnt10 + , CASE WHEN aaaa.no3='20' THEN bbbb.mnt11 ELSE bbbb.cnt11 END mnt11 + , CASE WHEN aaaa.no3='20' THEN bbbb.mnt12 ELSE bbbb.cnt12 END mnt12 + , CASE WHEN aaaa.no3='20' THEN bbbb.mntSum ELSE bbbb.cntSum END mntSum + + /* , IF (aaaa.no3='20', bbbb.mnt01, bbbb.cnt01) mnt01 , IF (aaaa.no3='20', bbbb.mnt02, bbbb.cnt02) mnt02 , IF (aaaa.no3='20', bbbb.mnt03, bbbb.cnt03) mnt03 @@ -1115,6 +1150,7 @@ , IF (aaaa.no3='20', bbbb.mnt11, bbbb.cnt11) mnt11 , IF (aaaa.no3='20', bbbb.mnt12, bbbb.cnt12) mnt12 , IF (aaaa.no3='20', bbbb.mntSum, bbbb.cntSum) mntSum + */ FROM ( @@ -1124,22 +1160,22 @@ , d.no3 FROM ( - SELECT #mngNmbrYr# edu_hope_yr + SELECT #mngNmbrYr# edu_hope_yr FROM DUAL )a ,( SELECT 10 div_cd - UNION ALL SELECT 20 no1 - UNION ALL SELECT 30 no1 - UNION ALL SELECT 99 no1 + UNION ALL SELECT 20 no1 FROM DUAL + UNION ALL SELECT 30 no1 FROM DUAL + UNION ALL SELECT 99 no1 FROM DUAL )b ,( - SELECT 10 edu_slct_cd - UNION ALL SELECT 20 no2 - UNION ALL SELECT 99 no2 + SELECT 10 edu_slct_cd FROM DUAL + UNION ALL SELECT 20 no2 FROM DUAL + UNION ALL SELECT 99 no2 FROM DUAL )c ,( - SELECT 10 no3 - UNION ALL SELECT 20 no2 + SELECT 10 no3 FROM DUAL + UNION ALL SELECT 20 no2 FROM DUAL )d )aaaa LEFT OUTER JOIN @@ -1623,6 +1659,7 @@ + /* VEInstrMixDAO.selectEduAreaInfo */ SELECT bbbbbb.user_id AS userId, bbbbbb.instr_nm AS instrNm, diff --git a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Tibero.xml index 3d888bed..af387134 100644 --- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Tibero.xml @@ -34,9 +34,9 @@ a.rsrch_strt_dt AS rsrchStrtDt, a.rsrch_end_dt AS rsrchEndDt, - 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 @@ -77,6 +77,7 @@ - /* 강의 조사를 요청한 설정 년월 리스트 */ + /* 강의 조사를 요청한 설정 년월 리스트 VELctrRsrchMngDAO.selectList */ SELECT FROM @@ -162,6 +163,7 @@ - + /* VELctrRsrchMngDAO.selectPagingListLctr */ SELECT COUNT(1) OVER() AS totCnt , dddd.rsrch_instr_div AS rsrchInstrDiv , dddd.stng_yr_mnt AS stngYrMnt @@ -239,13 +244,13 @@ , aaa.user_id , aaa.qlfct_end_yn , ccc.lctr_stng_ord - , IF(IFNULL(ccc.sun_lctr_yn, ddd.sun_lctr_yn)='Y',1,0) - + IF(IFNULL(ccc.mon_lctr_yn, ddd.mon_lctr_yn)='Y',1,0) - + IF(IFNULL(ccc.tue_lctr_yn, ddd.tue_lctr_yn)='Y',1,0) - + IF(IFNULL(ccc.wed_lctr_yn, ddd.wed_lctr_yn)='Y',1,0) - + IF(IFNULL(ccc.thu_lctr_yn, ddd.thu_lctr_yn)='Y',1,0) - + IF(IFNULL(ccc.fri_lctr_yn, ddd.fri_lctr_yn)='Y',1,0) - + IF(IFNULL(ccc.sat_lctr_yn, ddd.sat_lctr_yn)='Y',1,0) AS w_cnt + , IF(NVL(ccc.sun_lctr_yn, ddd.sun_lctr_yn)='Y',1,0) + + IF(NVL(ccc.mon_lctr_yn, ddd.mon_lctr_yn)='Y',1,0) + + IF(NVL(ccc.tue_lctr_yn, ddd.tue_lctr_yn)='Y',1,0) + + IF(NVL(ccc.wed_lctr_yn, ddd.wed_lctr_yn)='Y',1,0) + + IF(NVL(ccc.thu_lctr_yn, ddd.thu_lctr_yn)='Y',1,0) + + IF(NVL(ccc.fri_lctr_yn, ddd.fri_lctr_yn)='Y',1,0) + + IF(NVL(ccc.sat_lctr_yn, ddd.sat_lctr_yn)='Y',1,0) AS w_cnt , ddd.lctr_stng_ord AS other_lctr_stng_ord , ddd.instr_div , aaa.instr_detail_ord @@ -325,7 +330,7 @@ ON ( eeee.instr_div = dddd.instr_div AND eeee.user_id = dddd.user_id - AND eeee.lctr_stng_ord = IFNULL(dddd.lctr_stng_ord, dddd.other_lctr_stng_ord) + AND eeee.lctr_stng_ord = NVL(dddd.lctr_stng_ord, dddd.other_lctr_stng_ord) ) GROUP BY dddd.rsrch_instr_div @@ -344,7 +349,7 @@ - ORDER BY 1=1 + ORDER BY 1 @@ -357,7 +362,10 @@ - LIMIT #recordCountPerPage# OFFSET #firstIndex# + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; @@ -366,8 +374,7 @@ - SELECT concat(round(a.stndrd_yr*1+b.stndrd_mnt*1),'') stngYr + /* VELctrMIXDAO.selectStngYrList */ + SELECT concat(round(a.stndrd_yr*1+b.stndrd_mnt*1),'') stngYr + , CASE + WHEN TO_CHAR(SYSDATE,'YYYY')*1= (a.stndrd_yr*1+b.stndrd_mnt*1)*1 THEN 1 + ELSE 0 END AS useYn + /* , IF (DATE_FORMAT(NOW(),'%Y')= concat(round(a.stndrd_yr*1+b.stndrd_mnt*1),''),1,0) useYn + */ FROM ( - SELECT '2022' stndrd_yr + SELECT '2022' stndrd_yr FROM DUAL )a , ( - SELECT '01' stndrd_mnt - UNION ALL SELECT '02' - UNION ALL SELECT '03' - UNION ALL SELECT '04' - UNION ALL SELECT '05' - UNION ALL SELECT '06' - UNION ALL SELECT '07' - UNION ALL SELECT '08' - UNION ALL SELECT '09' - UNION ALL SELECT '0' + SELECT '01' stndrd_mnt FROM DUAL + UNION ALL SELECT '02' FROM DUAL + UNION ALL SELECT '03' FROM DUAL + UNION ALL SELECT '04' FROM DUAL + UNION ALL SELECT '05' FROM DUAL + UNION ALL SELECT '06' FROM DUAL + UNION ALL SELECT '07' FROM DUAL + UNION ALL SELECT '08' FROM DUAL + UNION ALL SELECT '09' FROM DUAL + UNION ALL SELECT '0' FROM DUAL )b ORDER BY a.stndrd_yr*1+b.stndrd_mnt*1 diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index 6a37621a..598bd2cd 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -42,17 +42,20 @@ + a.prcs_aplct_prd_ord AS prcsAplctPrdOrd, a.lctr_div_cd AS lctrDivCd, a.strt_pnttm AS strtPnttm, a.end_pnttm AS endPnttm, a.use_yn AS useYn, + - 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.anncm_cn AS anncmCn, a.popup_cn AS popupCn, a.atch_file_id AS atchFileId, @@ -62,10 +65,15 @@ ,a.dead_line_dt AS deadLineDt ,a.prcs_ord AS prcsOrd ,a.edu_part_cd AS eduPartCd + ,a.nos AS nos ,a.ddln_cd AS ddlnCd - ,a.edu_strt_pnttm AS eduStrtPnttm - ,a.edu_ddln_pnttm AS eduDdlnPnttm + + + ,a.edu_strt_pnttm AS eduStrtPnttm + ,a.edu_ddln_pnttm AS eduDdlnPnttm + + @@ -105,6 +113,7 @@ + /* VEPrcsAplctPrdDAO.selectList */ SELECT FROM @@ -204,6 +214,7 @@ + /* VEPrcsAplctPrdDAO.selectPagingList */ SELECT COUNT(1) OVER() AS totCnt , @@ -259,7 +271,7 @@ - ORDER BY 1=1 + ORDER BY 1 , a.prcs_aplct_prd_ord desc @@ -269,7 +281,10 @@ - LIMIT #recordCountPerPage# OFFSET #firstIndex# + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; @@ -318,7 +333,7 @@ - ORDER BY 1=1 + ORDER BY 1 , a.prcs_aplct_prd_ord desc @@ -328,7 +343,10 @@ - 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/schol/ScholInfo_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml index 3a3b0e4d..77c2a13a 100644 --- a/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml @@ -216,14 +216,19 @@ - + - - + + /* ScholInfoDAO.deleteIsltn */ DELETE FROM ve_schol_isltn WHERE SCHOL_ID = #scholId# @@ -298,6 +310,7 @@ + /* ScholInfoDAO.insertSelectIsltn */ INSERT INTO ve_schol_isltn ( diff --git a/src/main/resources/egovframework/sqlmap/ve/sttst/VESttst_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/sttst/VESttst_MIX_SQL_Tibero.xml index 32d37790..d1e742a2 100644 --- a/src/main/resources/egovframework/sqlmap/ve/sttst/VESttst_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/sttst/VESttst_MIX_SQL_Tibero.xml @@ -86,9 +86,9 @@ a.hope_sbjct AS hopeSbjct, a.rqst_cn AS rqstCn, - 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.schol_seal_atch_file_id AS scholSealAtchFileId, @@ -104,6 +104,7 @@ + /* VESttstMIXDAO.selectList */ SELECT FROM @@ -223,7 +225,7 @@ LEFT OUTER JOIN VE_EDU_OPRTN E ON A.EDU_APLCT_ORD = E.EDU_APLCT_ORD WHERE 1=1 - AND IFNULL(A.USE_YN, 'Y') ]]> 'N' + AND NVL(A.USE_YN, 'Y') ]]> 'N' AND A.SBMT_YN = 'Y' @@ -347,11 +349,11 @@ - AND DATE_FORMAT(NOW(),'%Y') = #searchYear# + AND TO_CHAR(SYSDATE,'YYYY') = #searchYear# - AND DATE_FORMAT(NOW(),'%c') = #searchMonth# + AND TO_CHAR(SYSDATE,'MM') = #searchMonth# @@ -365,12 +367,12 @@ (1=2 - OR (A.strt_oprtn_dt TO_CHAR(NOW(), 'YYYYMMDD') AND end_oprtn_dt = ]]> TO_CHAR(NOW(), 'YYYYMMDD')) + OR (A.strt_oprtn_dt TO_CHAR(SYSDATE, 'YYYYMMDD') AND end_oprtn_dt = ]]> TO_CHAR(NOW(), 'YYYYMMDD')) OR ( - A.end_oprtn_dt TO_CHAR(NOW(), 'YYYYMMDD') + A.end_oprtn_dt TO_CHAR(SYSDATE, 'YYYYMMDD') AND ( SELECT @@ -433,6 +435,7 @@ + /* VESttstMIXDAO.selectChasiList */ SELECT A.EDU_APLCT_ORD AS eduAplctOrd , A.LCTR_DIV_CD AS lctrDivCd @@ -633,9 +640,9 @@ , B.DIV_CD AS divCd , B.TRGT AS trgt , B.PRSNL AS prsnl - , DATE_FORMAT(B.FRST_REGIST_PNTTM,'%Y-%m-%d') AS frstRegistPnttm + , TO_CHAR(B.FRST_REGIST_PNTTM,'YYYY-MM-DD') AS frstRegistPnttm , B.FRST_REGISTER_ID AS frstRegisterId - , DATE_FORMAT(B.LAST_UPDT_PNTTM,'%Y-%m-%d') AS lastUpdtPnttm + , TO_CHAR(B.LAST_UPDT_PNTTM,'YYYY-MM-DD') AS lastUpdtPnttm , B.LAST_UPDUSR_ID AS lastUpdusrId , B.LRN_SBJCT AS lrnSbjct , B.LRN_CN AS lrnCn @@ -699,7 +706,7 @@ AND B.edu_chasi_ord = g.edu_chasi_ord ) WHERE 1=1 - AND IFNULL(A.USE_YN, 'Y') ]]> 'N' + AND NVL(A.USE_YN, 'Y') ]]> 'N' AND A.EDU_APLCT_ORD = B.EDU_APLCT_ORD AND A.EDU_APLCT_ORD = #eduAplctOrd# @@ -728,6 +735,7 @@ + /* VESttstMIXDAO.selectEduCnt */ SELECT - (SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND DATE_FORMAT(FRST_REGIST_PNTTM, '%Y%m') = CONCAT(#year#, '01')) AS jan - ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND DATE_FORMAT(FRST_REGIST_PNTTM, '%Y%m') = CONCAT(#year#, '02')) AS feb - ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND DATE_FORMAT(FRST_REGIST_PNTTM, '%Y%m') = CONCAT(#year#, '03')) AS mar - ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND DATE_FORMAT(FRST_REGIST_PNTTM, '%Y%m') = CONCAT(#year#, '04')) AS apr - ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND DATE_FORMAT(FRST_REGIST_PNTTM, '%Y%m') = CONCAT(#year#, '05')) AS may - ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND DATE_FORMAT(FRST_REGIST_PNTTM, '%Y%m') = CONCAT(#year#, '06')) AS jun - ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND DATE_FORMAT(FRST_REGIST_PNTTM, '%Y%m') = CONCAT(#year#, '07')) AS jul - ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND DATE_FORMAT(FRST_REGIST_PNTTM, '%Y%m') = CONCAT(#year#, '08')) AS aug - ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND DATE_FORMAT(FRST_REGIST_PNTTM, '%Y%m') = CONCAT(#year#, '09')) AS sep - ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND DATE_FORMAT(FRST_REGIST_PNTTM, '%Y%m') = CONCAT(#year#, '10')) AS oct - ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND DATE_FORMAT(FRST_REGIST_PNTTM, '%Y%m') = CONCAT(#year#, '11')) AS nov - ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND DATE_FORMAT(FRST_REGIST_PNTTM, '%Y%m') = CONCAT(#year#, '12')) AS decm - ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND DATE_FORMAT(FRST_REGIST_PNTTM, '%Y') = #year#) AS tot + (SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND TO_CHAR(FRST_REGIST_PNTTM, 'YYYYMM') = CONCAT(#year#, '01')) AS jan + ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND TO_CHAR(FRST_REGIST_PNTTM, 'YYYYMM') = CONCAT(#year#, '02')) AS feb + ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND TO_CHAR(FRST_REGIST_PNTTM, 'YYYYMM') = CONCAT(#year#, '03')) AS mar + ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND TO_CHAR(FRST_REGIST_PNTTM, 'YYYYMM') = CONCAT(#year#, '04')) AS apr + ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND TO_CHAR(FRST_REGIST_PNTTM, 'YYYYMM') = CONCAT(#year#, '05')) AS may + ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND TO_CHAR(FRST_REGIST_PNTTM, 'YYYYMM') = CONCAT(#year#, '06')) AS jun + ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND TO_CHAR(FRST_REGIST_PNTTM, 'YYYYMM') = CONCAT(#year#, '07')) AS jul + ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND TO_CHAR(FRST_REGIST_PNTTM, 'YYYYMM') = CONCAT(#year#, '08')) AS aug + ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND TO_CHAR(FRST_REGIST_PNTTM, 'YYYYMM') = CONCAT(#year#, '09')) AS sep + ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND TO_CHAR(FRST_REGIST_PNTTM, 'YYYYMM') = CONCAT(#year#, '10')) AS oct + ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND TO_CHAR(FRST_REGIST_PNTTM, 'YYYYMM') = CONCAT(#year#, '11')) AS nov + ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND TO_CHAR(FRST_REGIST_PNTTM, 'YYYYMM') = CONCAT(#year#, '12')) AS decm + ,(SELECT COUNT(1) FROM VE_EDU_APLCT WHERE LCTR_DIV_CD = '30' AND APRVL_CD = '60' AND TO_CHAR(FRST_REGIST_PNTTM, 'YYYY') = #year#) AS tot FROM - DB_ROOT + DUAL + /* GROUP BY TOT + */