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 fefc9b58..da9ffecf 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 @@ -209,107 +209,116 @@ /* VEInstrDetailDAO.insertDup */ - INSERT INTO ( - - - )VALUES( - #instrDiv#, - #userId#, - #instrDetailOrd#, - - #instrNm#, - #phone#, - #email#, - #post#, - #addr#, - #addrDetail#, - #rsdne#, - #dBirth#, - #finalSchol#, - #mjr#, - #apptYr#, - #apptDiv#, - #actvtCarer#, - #mnLctrCn#, - #phtAtchFileId#, - #blng#, - #pstn#, - #prfsnFld#, - #sbmtYn#, - #sbmtPnttm#, - #aprvlCd#, - #aprvlPnttm#, - #aprvlId#, - #aprvlCn#, - - - SYSDATE, - #frstRegisterId#, - SYSDATE, - #lastUpdusrId#, - - - #useYn#, - - - 'N', - - #qlfctEndYn#, - #qlfctEndPnttm#, - #qlfctEndCn#, - #divCd#, - #apptDt#, - #hchkDt#, - #rmrks#, - #memo# - ) - ON DUPLICATE KEY UPDATE - last_updt_pnttm=SYSDATE - , last_updusr_id=#frstRegisterId# - - - , instr_nm =#instrNm# - - , phone =#phone# - - , email =#email# - - , post =#post# - - , addr =#addr# - - , addr_detail =#addrDetail# - - , rsdne =#rsdne# - - , d_birth =#dBirth# - - , final_schol =#finalSchol# - - , mjr =#mjr# - - , appt_yr =#apptYr# - - , appt_div =#apptDiv# - - , actvt_carer =#actvtCarer# - - , mn_lctr_cn =#mnLctrCn# - - , blng =#blng# - - , pstn =#pstn# - - , prfsn_fld =#prfsnFld# - - , div_cd =#divCd# - - , rmrks =#rmrks# - - , memo =#memo# - - + MERGE INTO + USING DUAL + ON(instr_nm=#instrNm# AND phone=#phone#) + + WHEN NOT MATCHED THEN + INSERT + ( + + ) + VALUES( + #instrDiv#, + #userId#, + #instrDetailOrd#, + + #instrNm#, + #phone#, + #email#, + #post#, + #addr#, + #addrDetail#, + #rsdne#, + #dBirth#, + #finalSchol#, + #mjr#, + #apptYr#, + #apptDiv#, + #actvtCarer#, + #mnLctrCn#, + #phtAtchFileId#, + #blng#, + #pstn#, + #prfsnFld#, + #sbmtYn#, + #sbmtPnttm#, + #aprvlCd#, + #aprvlPnttm#, + #aprvlId#, + #aprvlCn#, + + + SYSDATE, + #frstRegisterId#, + SYSDATE, + #lastUpdusrId#, + + + #useYn#, + + + 'N', + + #qlfctEndYn#, + #qlfctEndPnttm#, + #qlfctEndCn#, + #divCd#, + #apptDt#, + #hchkDt#, + #rmrks#, + #memo#, + #sigMemo#, + #hopeEduFld# + ) + WHEN MATCHED THEN + UPDATE + SET last_updusr_id = #frstRegisterId# + , last_updt_pnttm = SYSDATE + + + , email =#email# + + , post =#post# + + , addr =#addr# + + , addr_detail =#addrDetail# + + , rsdne =#rsdne# + + , d_birth =#dBirth# + + , final_schol =#finalSchol# + + , mjr =#mjr# + + , appt_yr =#apptYr# + + , appt_div =#apptDiv# + + , actvt_carer =#actvtCarer# + + , mn_lctr_cn =#mnLctrCn# + + , blng =#blng# + + , pstn =#pstn# + + , prfsn_fld =#prfsnFld# + + , div_cd =#divCd# + + , rmrks =#rmrks# + + , memo =#memo# + + , sig_memo =#sigMemo# + + , hope_edu_fld =#hopeEduFld# + + diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml index ce732b9f..85344d41 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml @@ -3792,6 +3792,8 @@ ,last_updt_pnttm = sysdate ,last_updusr_id = #rqstId# WHERE instr_detail_ord = #instrDetailOrd# - AND instr_div = #instrDiv# + AND instr_div = #instrDiv# + AND user_id = #userId# + 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 6b99d135..827418d1 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 @@ -117,7 +117,7 @@ - + /* VELctrStngDAO.insert */ INSERT INTO ( @@ -185,111 +185,119 @@ + /* VELctrStngDAO.insertDup */ - INSERT INTO ( - - - )VALUES( - #instrDiv#, - #userId#, - #lctrStngOrd#, - - #sunLctrYn#, - #monLctrYn#, - #tueLctrYn#, - #wedLctrYn#, - #thuLctrYn#, - #friLctrYn#, - #satLctrYn#, - #zoomYn#, - #yrMxmmAsgnmTm#, - #mntMnmmTm#, - #prfrnFldCd#, - #onlnPsblYn#, - - #sbmtYn#, - - SYSDATE, - - - #sbmtPnttm#, - - - #aprvlCd#, - - SYSDATE, - - - #aprvlPnttm#, - + MERGE INTO + USING DUAL + ON(instr_div=#instrDiv# AND user_id=#userId# AND lctr_stng_ord=#lctrStngOrd#) - #aprvlId#, - #aprvlCn#, - - SYSDATE, - #frstRegisterId#, - SYSDATE, - #lastUpdusrId#, - - #useYn#, - - #isltnPsblYn#, - #cntnsLctrPsblYn#, - - #lctrStngYr#, - #asgnmTm1#, - #asgnmTm2#, - #asgnmTm3#, - #asgnmTm4#, - #asgnmTm5#, - #asgnmTm6#, - #asgnmTm7#, - #asgnmTm8#, - #asgnmTm9#, - #asgnmTm10#, - #asgnmTm11#, - #asgnmTm12# - ) + WHEN NOT MATCHED THEN + INSERT + ( + + ) + VALUES( - ON DUPLICATE KEY UPDATE - last_updt_pnttm=SYSDATE - , last_updusr_id=#frstRegisterId# - - - , sun_lctr_yn =#sunLctrYn# - - , mon_lctr_yn =#monLctrYn# - - , tue_lctr_yn =#tueLctrYn# - - , wed_lctr_yn =#wedLctrYn# - - , thu_lctr_yn =#thuLctrYn# - - , fri_lctr_yn =#friLctrYn# - - , sat_lctr_yn =#satLctrYn# - - - , zoom_yn =#zoomYn# - - , yr_mxmm_asgnm_tm =#yrMxmmAsgnmTm# - - , mnt_mnmm_tm =#mntMnmmTm# - - , prfrn_fld_cd =#prfrnFldCd# - - , onln_psbl_yn =#onlnPsblYn# - - , use_yn =#useYn# - - , isltn_psbl_yn =#isltnPsblYn# - - , cntns_lctr_psbl_yn =#cntnsLctrPsblYn# - - , lctr_stng_yr =#lctrStngYr# - - + #instrDiv#, + #userId#, + #lctrStngOrd#, + + #sunLctrYn#, + #monLctrYn#, + #tueLctrYn#, + #wedLctrYn#, + #thuLctrYn#, + #friLctrYn#, + #satLctrYn#, + #zoomYn#, + #yrMxmmAsgnmTm#, + #mntMnmmTm#, + #prfrnFldCd#, + #onlnPsblYn#, + + #sbmtYn#, + + SYSDATE, + + + #sbmtPnttm#, + + + #aprvlCd#, + + SYSDATE, + + + #aprvlPnttm#, + + + #aprvlId#, + #aprvlCn#, + + SYSDATE, + #frstRegisterId#, + SYSDATE, + #lastUpdusrId#, + + #useYn#, + + #isltnPsblYn#, + #cntnsLctrPsblYn#, + + #lctrStngYr#, + #asgnmTm1#, + #asgnmTm2#, + #asgnmTm3#, + #asgnmTm4#, + #asgnmTm5#, + #asgnmTm6#, + #asgnmTm7#, + #asgnmTm8#, + #asgnmTm9#, + #asgnmTm10#, + #asgnmTm11#, + #asgnmTm12# + ) + WHEN MATCHED THEN + UPDATE + SET last_updusr_id = #frstRegisterId# + , last_updt_pnttm = SYSDATE + + + , sun_lctr_yn =#sunLctrYn# + + , mon_lctr_yn =#monLctrYn# + + , tue_lctr_yn =#tueLctrYn# + + , wed_lctr_yn =#wedLctrYn# + + , thu_lctr_yn =#thuLctrYn# + + , fri_lctr_yn =#friLctrYn# + + , sat_lctr_yn =#satLctrYn# + + + , zoom_yn =#zoomYn# + + , yr_mxmm_asgnm_tm =#yrMxmmAsgnmTm# + + , mnt_mnmm_tm =#mntMnmmTm# + + , prfrn_fld_cd =#prfrnFldCd# + + , onln_psbl_yn =#onlnPsblYn# + + , use_yn =#useYn# + + , isltn_psbl_yn =#isltnPsblYn# + + , cntns_lctr_psbl_yn =#cntnsLctrPsblYn# + + , lctr_stng_yr =#lctrStngYr# + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMailDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMailDetail.jsp index 5e66b661..1b9bfd58 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMailDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMailDetail.jsp @@ -210,6 +210,7 @@ + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/mntInstrAsgnmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/mntInstrAsgnmMngList.jsp index 4f27d048..0ab332d1 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/mntInstrAsgnmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/mntInstrAsgnmMngList.jsp @@ -208,7 +208,7 @@ - +
(${fn:split(asgnmInfoT2.userId,'_')[1]*1}) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp index eed2bcc0..4343beb1 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp @@ -442,7 +442,7 @@ }, label: { show: true, - position: 'top', + position: 'bottom', lineHeight : 50, formatter : function(e){ return e.data + "명";