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

2024-01-24 17:18 강의 설정 관련 오류 수정

Browse Source
This commit is contained in:
myname 2024-01-24 17:19:00 +09:00
parent 2d990234a8
commit 76e404edaa
6 changed files with 227 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

199
src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml
View File

@ -209,106 +209,115 @@
<!-- 강사 등록 C --> <!-- 강사 등록 C -->
<insert id="VEInstrDetailDAO.insertDup" parameterClass="VEInstrDetailVO"> <insert id="VEInstrDetailDAO.insertDup" parameterClass="VEInstrDetailVO">
/* VEInstrDetailDAO.insertDup */ /* VEInstrDetailDAO.insertDup */
INSERT INTO <include refid="VEInstrDetailDAO.table_name"/> (
<include refid="VEInstrDetailDAO.column_name"/>
)VALUES( MERGE INTO <include refid="VEInstrDetailDAO.table_name"/>
#instrDiv#, USING DUAL
#userId#, ON(instr_nm=#instrNm# AND phone=#phone#)
#instrDetailOrd#,
#instrNm#, WHEN NOT MATCHED THEN
#phone#, INSERT
#email#, (
#post#, <include refid="VEInstrDetailDAO.column_name"/>
#addr#, )
#addrDetail#, VALUES(
#rsdne#, #instrDiv#,
#dBirth#, #userId#,
#finalSchol#, #instrDetailOrd#,
#mjr#,
#apptYr#, #instrNm#,
#apptDiv#, #phone#,
#actvtCarer#, #email#,
#mnLctrCn#, #post#,
#phtAtchFileId#, #addr#,
#blng#, #addrDetail#,
#pstn#, #rsdne#,
#prfsnFld#, #dBirth#,
#sbmtYn#, #finalSchol#,
#sbmtPnttm#, #mjr#,
#aprvlCd#, #apptYr#,
#aprvlPnttm#, #apptDiv#,
#aprvlId#, #actvtCarer#,
#aprvlCn#, #mnLctrCn#,
#phtAtchFileId#,
#blng#,
#pstn#,
#prfsnFld#,
#sbmtYn#,
#sbmtPnttm#,
#aprvlCd#,
#aprvlPnttm#,
#aprvlId#,
#aprvlCn#,
SYSDATE, SYSDATE,
#frstRegisterId#, #frstRegisterId#,
SYSDATE, SYSDATE,
#lastUpdusrId#, #lastUpdusrId#,
<!-- useYn 값 없을 시 N 기본 --> <!-- useYn 값 없을 시 N 기본 -->
<isNotEmpty property="useYn"> <isNotEmpty property="useYn">
#useYn#, #useYn#,
</isNotEmpty> </isNotEmpty>
<isEmpty property="useYn"> <isEmpty property="useYn">
'N', 'N',
</isEmpty> </isEmpty>
#qlfctEndYn#, #qlfctEndYn#,
#qlfctEndPnttm#, #qlfctEndPnttm#,
#qlfctEndCn#, #qlfctEndCn#,
#divCd#, #divCd#,
#apptDt#, #apptDt#,
#hchkDt#, #hchkDt#,
#rmrks#, #rmrks#,
#memo# #memo#,
) #sigMemo#,
#hopeEduFld#
)
WHEN MATCHED THEN
UPDATE
SET last_updusr_id = #frstRegisterId#
, last_updt_pnttm = SYSDATE
ON DUPLICATE KEY UPDATE <isNotEmpty property="email">
last_updt_pnttm=SYSDATE , email =#email#
, last_updusr_id=#frstRegisterId# </isNotEmpty><isNotEmpty property="post">
, post =#post#
<isNotEmpty property="instrNm"> </isNotEmpty><isNotEmpty property="addr">
, instr_nm =#instrNm# , addr =#addr#
</isNotEmpty><isNotEmpty property="phone"> </isNotEmpty><isNotEmpty property="addrDetail">
, phone =#phone# , addr_detail =#addrDetail#
</isNotEmpty><isNotEmpty property="email"> </isNotEmpty><isNotEmpty property="rsdne">
, email =#email# , rsdne =#rsdne#
</isNotEmpty><isNotEmpty property="post"> </isNotEmpty><isNotEmpty property="dBirth">
, post =#post# , d_birth =#dBirth#
</isNotEmpty><isNotEmpty property="addr"> </isNotEmpty><isNotEmpty property="finalSchol">
, addr =#addr# , final_schol =#finalSchol#
</isNotEmpty><isNotEmpty property="addrDetail"> </isNotEmpty><isNotEmpty property="mjr">
, addr_detail =#addrDetail# , mjr =#mjr#
</isNotEmpty><isNotEmpty property="rsdne"> </isNotEmpty><isNotEmpty property="apptYr">
, rsdne =#rsdne# , appt_yr =#apptYr#
</isNotEmpty><isNotEmpty property="dBirth"> </isNotEmpty><isNotEmpty property="apptDiv">
, d_birth =#dBirth# , appt_div =#apptDiv#
</isNotEmpty><isNotEmpty property="finalSchol"> </isNotEmpty><isNotEmpty property="actvtCarer">
, final_schol =#finalSchol# , actvt_carer =#actvtCarer#
</isNotEmpty><isNotEmpty property="mjr"> </isNotEmpty><isNotEmpty property="mnLctrCn">
, mjr =#mjr# , mn_lctr_cn =#mnLctrCn#
</isNotEmpty><isNotEmpty property="apptYr"> </isNotEmpty><isNotEmpty property="blng">
, appt_yr =#apptYr# , blng =#blng#
</isNotEmpty><isNotEmpty property="apptDiv"> </isNotEmpty><isNotEmpty property="pstn">
, appt_div =#apptDiv# , pstn =#pstn#
</isNotEmpty><isNotEmpty property="actvtCarer"> </isNotEmpty><isNotEmpty property="prfsnFld">
, actvt_carer =#actvtCarer# , prfsn_fld =#prfsnFld#
</isNotEmpty><isNotEmpty property="mnLctrCn"> </isNotEmpty><isNotEmpty property="divCd">
, mn_lctr_cn =#mnLctrCn# , div_cd =#divCd#
</isNotEmpty><isNotEmpty property="blng"> </isNotEmpty><isNotEmpty property="rmrks">
, blng =#blng# , rmrks =#rmrks#
</isNotEmpty><isNotEmpty property="pstn"> </isNotEmpty><isNotEmpty property="memo">
, pstn =#pstn# , memo =#memo#
</isNotEmpty><isNotEmpty property="prfsnFld"> </isNotEmpty><isNotEmpty property="sigMemo">
, prfsn_fld =#prfsnFld# , sig_memo =#sigMemo#
</isNotEmpty><isNotEmpty property="divCd"> </isNotEmpty><isNotEmpty property="hopeEduFld">
, div_cd =#divCd# , hope_edu_fld =#hopeEduFld#
</isNotEmpty><isNotEmpty property="rmrks"> </isNotEmpty>
, rmrks =#rmrks#
</isNotEmpty><isNotEmpty property="memo">
, memo =#memo#
</isNotEmpty>
</insert> </insert>

4
src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml
View File

@ -3792,6 +3792,8 @@
,last_updt_pnttm = sysdate ,last_updt_pnttm = sysdate
,last_updusr_id = #rqstId# ,last_updusr_id = #rqstId#
WHERE instr_detail_ord = #instrDetailOrd# WHERE instr_detail_ord = #instrDetailOrd#
AND instr_div = #instrDiv# AND instr_div = #instrDiv#
AND user_id = #userId#
</update> </update>
</sqlMap> </sqlMap>

192
src/main/resources/egovframework/sqlmap/ve/lctr/VELctrStng_SQL_Tibero.xml
View File

@ -117,7 +117,7 @@
<!-- 강사 등록 C --> <!-- 강사 등록 C -->
<insert id="VELctrStngDAO.insert" parameterClass="VELctrDetailVO"> <insert id="VELctrStngDAO.insert" parameterClass="VELctrDetailVO">
/* VELctrStngDAO.insert */
INSERT INTO <include refid="VELctrStngDAO.table_name"/> ( INSERT INTO <include refid="VELctrStngDAO.table_name"/> (
<include refid="VELctrStngDAO.column_name"/> <include refid="VELctrStngDAO.column_name"/>
@ -185,110 +185,118 @@
</insert> </insert>
<insert id="VELctrStngDAO.insertDup" parameterClass="VELctrDetailVO"> <insert id="VELctrStngDAO.insertDup" parameterClass="VELctrDetailVO">
/* VELctrStngDAO.insertDup */
INSERT INTO <include refid="VELctrStngDAO.table_name"/> ( MERGE INTO <include refid="VELctrStngDAO.table_name"/>
<include refid="VELctrStngDAO.column_name"/> USING DUAL
ON(instr_div=#instrDiv# AND user_id=#userId# AND lctr_stng_ord=#lctrStngOrd#)
)VALUES( WHEN NOT MATCHED THEN
#instrDiv#, INSERT
#userId#, (
#lctrStngOrd#, <include refid="VELctrStngDAO.column_name"/>
)
VALUES(
#sunLctrYn#, #instrDiv#,
#monLctrYn#, #userId#,
#tueLctrYn#, #lctrStngOrd#,
#wedLctrYn#,
#thuLctrYn#,
#friLctrYn#,
#satLctrYn#,
#zoomYn#,
#yrMxmmAsgnmTm#,
#mntMnmmTm#,
#prfrnFldCd#,
#onlnPsblYn#,
#sbmtYn#, #sunLctrYn#,
<isNotEmpty property="sbmtYn"> #monLctrYn#,
SYSDATE, #tueLctrYn#,
</isNotEmpty> #wedLctrYn#,
<isEmpty property="sbmtYn"> #thuLctrYn#,
#sbmtPnttm#, #friLctrYn#,
</isEmpty> #satLctrYn#,
#zoomYn#,
#yrMxmmAsgnmTm#,
#mntMnmmTm#,
#prfrnFldCd#,
#onlnPsblYn#,
#aprvlCd#, #sbmtYn#,
<isNotEmpty property="aprvlCd"> <isNotEmpty property="sbmtYn">
SYSDATE, SYSDATE,
</isNotEmpty> </isNotEmpty>
<isEmpty property="aprvlCd"> <isEmpty property="sbmtYn">
#aprvlPnttm#, #sbmtPnttm#,
</isEmpty> </isEmpty>
#aprvlId#, #aprvlCd#,
#aprvlCn#, <isNotEmpty property="aprvlCd">
SYSDATE,
</isNotEmpty>
<isEmpty property="aprvlCd">
#aprvlPnttm#,
</isEmpty>
SYSDATE, #aprvlId#,
#frstRegisterId#, #aprvlCn#,
SYSDATE,
#lastUpdusrId#,
#useYn#, SYSDATE,
#frstRegisterId#,
SYSDATE,
#lastUpdusrId#,
#isltnPsblYn#, #useYn#,
#cntnsLctrPsblYn#,
#lctrStngYr#, #isltnPsblYn#,
#asgnmTm1#, #cntnsLctrPsblYn#,
#asgnmTm2#,
#asgnmTm3#,
#asgnmTm4#,
#asgnmTm5#,
#asgnmTm6#,
#asgnmTm7#,
#asgnmTm8#,
#asgnmTm9#,
#asgnmTm10#,
#asgnmTm11#,
#asgnmTm12#
)
ON DUPLICATE KEY UPDATE #lctrStngYr#,
last_updt_pnttm=SYSDATE #asgnmTm1#,
, last_updusr_id=#frstRegisterId# #asgnmTm2#,
#asgnmTm3#,
#asgnmTm4#,
#asgnmTm5#,
#asgnmTm6#,
#asgnmTm7#,
#asgnmTm8#,
#asgnmTm9#,
#asgnmTm10#,
#asgnmTm11#,
#asgnmTm12#
)
WHEN MATCHED THEN
UPDATE
SET last_updusr_id = #frstRegisterId#
, last_updt_pnttm = SYSDATE
<isNotEmpty property="sunLctrYn"> <isNotEmpty property="sunLctrYn">
, sun_lctr_yn =#sunLctrYn# , sun_lctr_yn =#sunLctrYn#
</isNotEmpty><isNotEmpty property="monLctrYn"> </isNotEmpty><isNotEmpty property="monLctrYn">
, mon_lctr_yn =#monLctrYn# , mon_lctr_yn =#monLctrYn#
</isNotEmpty><isNotEmpty property="tueLctrYn"> </isNotEmpty><isNotEmpty property="tueLctrYn">
, tue_lctr_yn =#tueLctrYn# , tue_lctr_yn =#tueLctrYn#
</isNotEmpty><isNotEmpty property="wedLctrYn"> </isNotEmpty><isNotEmpty property="wedLctrYn">
, wed_lctr_yn =#wedLctrYn# , wed_lctr_yn =#wedLctrYn#
</isNotEmpty><isNotEmpty property="thuLctrYn"> </isNotEmpty><isNotEmpty property="thuLctrYn">
, thu_lctr_yn =#thuLctrYn# , thu_lctr_yn =#thuLctrYn#
</isNotEmpty><isNotEmpty property="friLctrYn"> </isNotEmpty><isNotEmpty property="friLctrYn">
, fri_lctr_yn =#friLctrYn# , fri_lctr_yn =#friLctrYn#
</isNotEmpty><isNotEmpty property="satLctrYn"> </isNotEmpty><isNotEmpty property="satLctrYn">
, sat_lctr_yn =#satLctrYn# , sat_lctr_yn =#satLctrYn#
</isNotEmpty><isNotEmpty property="zoomYn"> </isNotEmpty><isNotEmpty property="zoomYn">
, zoom_yn =#zoomYn# , zoom_yn =#zoomYn#
</isNotEmpty><isNotEmpty property="yrMxmmAsgnmTm"> </isNotEmpty><isNotEmpty property="yrMxmmAsgnmTm">
, yr_mxmm_asgnm_tm =#yrMxmmAsgnmTm# , yr_mxmm_asgnm_tm =#yrMxmmAsgnmTm#
</isNotEmpty><isNotEmpty property="mntMnmmTm"> </isNotEmpty><isNotEmpty property="mntMnmmTm">
, mnt_mnmm_tm =#mntMnmmTm# , mnt_mnmm_tm =#mntMnmmTm#
</isNotEmpty><isNotEmpty property="prfrnFldCd"> </isNotEmpty><isNotEmpty property="prfrnFldCd">
, prfrn_fld_cd =#prfrnFldCd# , prfrn_fld_cd =#prfrnFldCd#
</isNotEmpty><isNotEmpty property="onlnPsblYn"> </isNotEmpty><isNotEmpty property="onlnPsblYn">
, onln_psbl_yn =#onlnPsblYn# , onln_psbl_yn =#onlnPsblYn#
</isNotEmpty><isNotEmpty property="useYn"> </isNotEmpty><isNotEmpty property="useYn">
, use_yn =#useYn# , use_yn =#useYn#
</isNotEmpty><isNotEmpty property="isltnPsblYn"> </isNotEmpty><isNotEmpty property="isltnPsblYn">
, isltn_psbl_yn =#isltnPsblYn# , isltn_psbl_yn =#isltnPsblYn#
</isNotEmpty><isNotEmpty property="cntnsLctrPsblYn"> </isNotEmpty><isNotEmpty property="cntnsLctrPsblYn">
, cntns_lctr_psbl_yn =#cntnsLctrPsblYn# , cntns_lctr_psbl_yn =#cntnsLctrPsblYn#
</isNotEmpty><isNotEmpty property="lctrStngYr"> </isNotEmpty><isNotEmpty property="lctrStngYr">
, lctr_stng_yr =#lctrStngYr# , lctr_stng_yr =#lctrStngYr#
</isNotEmpty> </isNotEmpty>
</insert> </insert>

3
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMailDetail.jsp
View File

@ -210,6 +210,7 @@
<button type="button" class="btn_type03" onclick="fncSndEmail();return false;">테스트 이메일 발송</button> <button type="button" class="btn_type03" onclick="fncSndEmail();return false;">테스트 이메일 발송</button>
</div> </div>
</div> </div>
<!--
<br/>----------하기는 메일 발송 계정 관련 내용임(테스트용)----------------------------------------------------------------------- <br/>----------하기는 메일 발송 계정 관련 내용임(테스트용)-----------------------------------------------------------------------
<div class="btn_wrap btn_layout01"> <div class="btn_wrap btn_layout01">
<div class="btn_right"> <div class="btn_right">
@ -222,7 +223,7 @@
<br/>//1. sndFlag = 메뉴 구분 <br/>//1. sndFlag = 메뉴 구분
<br/>// C -> 기존계정 발송 <br/>// C -> 기존계정 발송
<br/>// UR -> 입력한 ID/PWD로 발송 <br/>// UR -> 입력한 ID/PWD로 발송
-->
</div> </div>
</div> </div>
</div> </div>

2
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/mntInstrAsgnmMngList.jsp
View File

@ -208,7 +208,7 @@
<c:forEach var="asgnmInfoT2" items="${vEInstrAssiEduAplctVOList}" varStatus="status"> <c:forEach var="asgnmInfoT2" items="${vEInstrAssiEduAplctVOList}" varStatus="status">
<tr> <tr>
<td><c:out value="${asgnmInfoT2.yr}" /> <td>
<c:out value="${asgnmInfoT2.instrNm}"/> <c:out value="${asgnmInfoT2.instrNm}"/>
<c:if test="${asgnmInfoT2.instrNm ne null}"> <c:if test="${asgnmInfoT2.instrNm ne null}">
<br/>(${fn:split(asgnmInfoT2.userId,'_')[1]*1}) <br/>(${fn:split(asgnmInfoT2.userId,'_')[1]*1})

2
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp
View File

@ -442,7 +442,7 @@
}, },
label: { label: {
show: true, show: true,
position: 'top', position: 'bottom',
lineHeight : 50, lineHeight : 50,
formatter : function(e){ formatter : function(e){
return e.data + "명"; return e.data + "명";