diff --git a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java index 69581ead..dbfe0ea4 100644 --- a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java @@ -2176,7 +2176,8 @@ public class OprtnInstrTngrPrflContoller { //강의조사제출값 저장 try { - vELctrRsrchSbmtService.insert(vELctrDetailVO); + //vELctrRsrchSbmtService.insert(vELctrDetailVO); + vELctrRsrchSbmtService.update(vELctrDetailVO); }catch(Exception ex) { ex.printStackTrace(); } diff --git a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml index 46b3ed34..e57b2ed5 100644 --- a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml @@ -74,7 +74,7 @@ + /* loginDAO.selectAuthorities */ + /* VEAsgnmMIXDAO.selectList */ SELECT FROM @@ -170,6 +172,7 @@ + /* VEAsgnmMIXDAO.selectAsgnmRqstPagingList */ SELECT COUNT(1) OVER() AS totCnt , userId , @@ -501,18 +505,23 @@ AND AA.cnt = 0 - ORDER BY 1=1 + ORDER BY 1 , AA.eduHopeDt DESC , $orderByQuery$ - LIMIT #recordCountPerPage# OFFSET #firstIndex# + + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; + /* VEAsgnmMIXDAO.selectAsgnmRqstDetail4 */ SELECT a.edu_hope_dt AS eduHopeDt , a.edu_aplct_ord AS eduAplctOrd , a.edu_chasi_ord AS eduChasiOrd @@ -780,6 +804,7 @@ + /* VEAsgnmMIXDAO.selectAsgnmDetail */ SELECT a.edu_hope_dt AS eduHopeDt , a.edu_aplct_ord AS eduAplctOrd , a.edu_chasi_ord AS eduChasiOrd @@ -3092,7 +3118,7 @@ /* - 온라인 청소년 + 온라인 청소년 VEAsgnmMIXDAO.selectInstrAsgnmOnList_220210 */ SELECT aaaaaa.edu_aplct_ord AS eduAplctOrd , aaaaaa.edu_chasi_ord AS eduChasiOrd @@ -3210,7 +3236,7 @@ /* - 오프라인 청소년 자동배정 + 오프라인 청소년 자동배정 VEAsgnmMIXDAO.selectInstrAsgnmOffList_220210 */ SELECT aaaaaa.edu_aplct_ord AS eduAplctOrd , aaaaaa.edu_chasi_ord AS eduChasiOrd @@ -3326,6 +3352,7 @@ /* - 온라인 청소년 + 온라인 청소년 VEAsgnmMIXDAO.selectInstrAsgnmOnPagingList */ SELECT COUNT(1) OVER() AS totCnt , aaaa.edu_aplct_ord AS eduAplctOrd @@ -3847,13 +3874,16 @@ /* , aaaaaa.lrn_tm_sum/(aaaaaa.mnt_mnmm_tm+1) 9.수업 할당 */ , aaaaaa.lrn_tm_sum /* 9.수업 할당 */ - LIMIT #recordCountPerPage# OFFSET #firstIndex# + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; @@ -4364,6 +4398,7 @@ + /* VEAsgnmMIXDAO.selectInstrMassAsgnmStep0 */ SELECT b.edu_aplct_ord AS eduAplctOrd , b.edu_chasi_ord AS eduChasiOrd , a.edu_slct_cd AS eduSlctCd /*10-온라인, 20-오프라인*/ @@ -4402,6 +4438,7 @@ + /* VEAsgnmMIXDAO.selectInstrDstncStep1 */ SELECT b.new_addr AS sAddr , d.addr AS iAddr , ifnull(e.oneway_dstnc,'') AS onewayDstnc @@ -4514,6 +4552,7 @@ + /* VEAsgnmMIXDAO.selectInstrDstncStep3 */ SELECT b.new_addr AS sAddr , d.addr AS iAddr , ifnull(e.oneway_dstnc,'') AS onewayDstnc @@ -4688,6 +4728,7 @@ + /* VEAsgnmMIXDAO.selectTtlMntChasiSumDetail */ SELECT aa0.sumMntChasi , bb0.sumMntLctr , CEIL(CAST(aa0.sumMntChasi AS DOUBLE)/bb0.sumMntLctr) AS mxmmChasi @@ -4796,6 +4838,7 @@ @@ -1041,7 +1041,7 @@ /* 배정 대상 년도를 한정 */ - AND SUBSTRING(b.edu_hope_dt,1,4)=DATE_FORMAT(NOW(),'%Y') + AND SUBSTRING(b.edu_hope_dt,1,4)=TO_CHAR(SYSDATE,'YYYY') diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_SQL_Tibero.xml index a8ecc6fb..dcaaed4c 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_SQL_Tibero.xml @@ -29,9 +29,9 @@ a.tngr_instr_yn AS tngrInstrYn, a.adult_instr_yn AS adultInstrYn, - 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 diff --git a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Tibero.xml index 2de3ad24..99829645 100644 --- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Tibero.xml @@ -245,7 +245,7 @@ - ORDER BY 1=1 + ORDER BY 1 , b.user_id desc @@ -254,8 +254,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/lctr/VELctrRsrchSbmt_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchSbmt_SQL_Tibero.xml index 5aeba9ae..85400307 100644 --- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchSbmt_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchSbmt_SQL_Tibero.xml @@ -128,27 +128,53 @@ - UPDATE - - SET - - last_updt_pnttm=now() - , last_updusr_id=#lastUpdusrId# - - - , strt_dt = #strtDt# - - - , end_dt = #endDt# - - - - WHERE + /* VELctrRsrchSbmtDAO.update */ + MERGE INTO + USING DUAL + ON( rsrch_instr_div = #rsrchInstrDiv# - AND stng_yr_mnt = #stngYrMnt# + AND stng_yr_mnt = #stngYrMnt# + AND instr_div = #instrDiv# - AND user_id = #userId# - AND lctr_stng_ord = #lctrStngOrd# + AND user_id = #userId# + ) + + WHEN NOT MATCHED THEN + INSERT + ( + + ) + VALUES( + #rsrchInstrDiv#, + #stngYrMnt#, + + #instrDiv#, + #userId#, + #lctrStngOrd#, + + + SYSDATE, + #frstRegisterId#, + NULL, + NULL, + + #strtDt#, + #endDt# + ) + + WHEN MATCHED THEN + UPDATE + SET last_updt_pnttm = SYSDATE + , last_updusr_id = #frstRegisterId# + + + , strt_dt = #strtDt# + + + , end_dt = #endDt# + + + @@ -166,6 +192,7 @@ + /* VELctrRsrchSbmtDAO.selectPagingList */ SELECT COUNT(1) OVER() AS totCnt , diff --git a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrStng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrStng_SQL_Tibero.xml index 21cc882c..6b99d135 100644 --- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrStng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrStng_SQL_Tibero.xml @@ -456,6 +456,39 @@ + UPDATE + ( + SELECT cc.use_yn + FROM ve_lctr_stng cc + ,( + SELECT a.instr_div + , a.user_id + , a.lctr_stng_ord + , a.use_yn + FROM ve_lctr_stng a + LEFT OUTER JOIN ve_lctr_stng b + ON( + a.instr_div=b.instr_div + AND a.user_id=b.user_id + AND a.lctr_stng_ord=b.lctr_stng_ord + AND b.instr_div = #instrDiv# + AND b.user_id = #userId# + AND b.lctr_stng_ord = #lctrStngOrd# + ) + WHERE a.instr_div = #instrDiv# + AND a.user_id = #userId# + AND b.lctr_stng_ord IS null + )dd + WHERE cc.instr_div=dd.instr_div + AND cc.user_id=dd.user_id + AND cc.lctr_stng_ord=dd.lctr_stng_ord + )AA + SET AA.use_yn=#useYn# + + + + + UPDATE ve_lctr_stng cc, ( @@ -484,7 +517,6 @@ AND cc.lctr_stng_ord=dd.lctr_stng_ord - DELETE FROM