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

2024-01-24 17:19:00 +09:00 · 2024-01-24 17:19:00 +09:00 · 76e404edaa
commit 76e404edaa
parent 2d990234a8
6 changed files with 227 additions and 207 deletions
--- 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,106 +209,115 @@
 	<!-- 강사 등록 C -->
 	<insert id="VEInstrDetailDAO.insertDup" parameterClass="VEInstrDetailVO">			
 		/*	VEInstrDetailDAO.insertDup	*/
-		INSERT INTO <include refid="VEInstrDetailDAO.table_name"/> (
-			<include refid="VEInstrDetailDAO.column_name"/>
 		
-		)VALUES(
-			#instrDiv#,
-	       	#userId#,
-	       	#instrDetailOrd#,
+		MERGE INTO <include refid="VEInstrDetailDAO.table_name"/>
+		USING DUAL
+		ON(instr_nm=#instrNm#	AND	phone=#phone#)				
 		
-	       	#instrNm#,
-	       	#phone#,
-	       	#email#,
-	       	#post#,
-	       	#addr#,
-	       	#addrDetail#,
-	       	#rsdne#,
-	       	#dBirth#,
-	       	#finalSchol#,
-	       	#mjr#,
-	       	#apptYr#,
-	       	#apptDiv#,
-	       	#actvtCarer#,
-	       	#mnLctrCn#,
-	       	#phtAtchFileId#,
-	       	#blng#,
-	       	#pstn#,
-	       	#prfsnFld#,
-	       	#sbmtYn#,
-	       	#sbmtPnttm#,
-	       	#aprvlCd#,
-	       	#aprvlPnttm#,
-	       	#aprvlId#,
-       		#aprvlCn#,	    
+		WHEN NOT MATCHED THEN
+			INSERT				
+					(
+						<include refid="VEInstrDetailDAO.column_name"/>
+					)
+			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 기본 -->
-       		<isNotEmpty property="useYn">
-       		#useYn#,
-       		</isNotEmpty>
-       		<isEmpty property="useYn">
-       		'N',
-       		</isEmpty>
-       		#qlfctEndYn#,
-       		#qlfctEndPnttm#,
-       		#qlfctEndCn#,
-       		#divCd#,
-       		#apptDt#,       		
-       		#hchkDt#,
-       		#rmrks#,
-       		#memo#
-		)
+	       		SYSDATE,
+	       		#frstRegisterId#,
+	       		SYSDATE,
+	       		#lastUpdusrId#,
+	       		<!-- useYn 값 없을 시 N 기본 -->
+	       		<isNotEmpty property="useYn">
+	       		#useYn#,
+	       		</isNotEmpty>
+	       		<isEmpty property="useYn">
+	       		'N',
+	       		</isEmpty>
+	       		#qlfctEndYn#,
+	       		#qlfctEndPnttm#,
+	       		#qlfctEndCn#,
+	       		#divCd#,
+	       		#apptDt#,       		
+	       		#hchkDt#,
+	       		#rmrks#,
+	       		#memo#,
+	       		#sigMemo#,
+       			#hopeEduFld#
+			)		
+		WHEN MATCHED THEN
+			UPDATE
+				SET last_updusr_id 	= #frstRegisterId#
+					, last_updt_pnttm 	= SYSDATE
 												
-		ON DUPLICATE KEY UPDATE 
-			last_updt_pnttm=SYSDATE 
-			, last_updusr_id=#frstRegisterId#		
-			
-		<isNotEmpty property="instrNm">
-			, instr_nm			=#instrNm#
-		</isNotEmpty><isNotEmpty property="phone">
-			, phone				=#phone#
-		</isNotEmpty><isNotEmpty property="email">
-			, email				=#email#
-		</isNotEmpty><isNotEmpty property="post">
-			, post				=#post#
-		</isNotEmpty><isNotEmpty property="addr">
-			, addr				=#addr#
-		</isNotEmpty><isNotEmpty property="addrDetail">
-			, addr_detail		=#addrDetail#
-		</isNotEmpty><isNotEmpty property="rsdne">
-			, rsdne				=#rsdne#
-		</isNotEmpty><isNotEmpty property="dBirth">
-			, d_birth			=#dBirth#
-		</isNotEmpty><isNotEmpty property="finalSchol">
-			, final_schol		=#finalSchol#
-		</isNotEmpty><isNotEmpty property="mjr">
-			, mjr				=#mjr#
-		</isNotEmpty><isNotEmpty property="apptYr">
-			, appt_yr			=#apptYr#
-		</isNotEmpty><isNotEmpty property="apptDiv">
-			, appt_div			=#apptDiv#
-		</isNotEmpty><isNotEmpty property="actvtCarer">
-			, actvt_carer		=#actvtCarer#
-		</isNotEmpty><isNotEmpty property="mnLctrCn">
-			, mn_lctr_cn		=#mnLctrCn#
-		</isNotEmpty><isNotEmpty property="blng">
-			, blng				=#blng#
-		</isNotEmpty><isNotEmpty property="pstn">
-			, pstn				=#pstn#
-		</isNotEmpty><isNotEmpty property="prfsnFld">
-			, prfsn_fld			=#prfsnFld#
-		</isNotEmpty><isNotEmpty property="divCd">
-			, div_cd	=#divCd#
-		</isNotEmpty><isNotEmpty property="rmrks">
-			, rmrks	=#rmrks#
-		</isNotEmpty><isNotEmpty property="memo">
-			, memo	=#memo#
-		</isNotEmpty>
+				<isNotEmpty property="email">
+					, email				=#email#
+				</isNotEmpty><isNotEmpty property="post">
+					, post				=#post#
+				</isNotEmpty><isNotEmpty property="addr">
+					, addr				=#addr#
+				</isNotEmpty><isNotEmpty property="addrDetail">
+					, addr_detail		=#addrDetail#
+				</isNotEmpty><isNotEmpty property="rsdne">
+					, rsdne				=#rsdne#
+				</isNotEmpty><isNotEmpty property="dBirth">
+					, d_birth			=#dBirth#
+				</isNotEmpty><isNotEmpty property="finalSchol">
+					, final_schol		=#finalSchol#
+				</isNotEmpty><isNotEmpty property="mjr">
+					, mjr				=#mjr#
+				</isNotEmpty><isNotEmpty property="apptYr">
+					, appt_yr			=#apptYr#
+				</isNotEmpty><isNotEmpty property="apptDiv">
+					, appt_div			=#apptDiv#
+				</isNotEmpty><isNotEmpty property="actvtCarer">
+					, actvt_carer		=#actvtCarer#
+				</isNotEmpty><isNotEmpty property="mnLctrCn">
+					, mn_lctr_cn		=#mnLctrCn#
+				</isNotEmpty><isNotEmpty property="blng">
+					, blng				=#blng#
+				</isNotEmpty><isNotEmpty property="pstn">
+					, pstn				=#pstn#
+				</isNotEmpty><isNotEmpty property="prfsnFld">
+					, prfsn_fld			=#prfsnFld#
+				</isNotEmpty><isNotEmpty property="divCd">
+					, div_cd	=#divCd#
+				</isNotEmpty><isNotEmpty property="rmrks">
+					, rmrks	=#rmrks#
+				</isNotEmpty><isNotEmpty property="memo">
+					, memo	=#memo#
+				</isNotEmpty><isNotEmpty property="sigMemo">
+					, sig_memo	=#sigMemo#
+				</isNotEmpty><isNotEmpty property="hopeEduFld">
+					, hope_edu_fld	=#hopeEduFld#
+				</isNotEmpty>
 				
 	</insert>	
 	
--- 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#			
+		
 	</update>
 </sqlMap>
--- 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 @@
 	
 	<!-- 강사 등록 C -->
 	<insert id="VELctrStngDAO.insert" parameterClass="VELctrDetailVO">
-				
+		/*	VELctrStngDAO.insert	*/
 		INSERT INTO <include refid="VELctrStngDAO.table_name"/> (
 			<include refid="VELctrStngDAO.column_name"/>
 			
@ -185,110 +185,118 @@
 	</insert>
 	
 	<insert id="VELctrStngDAO.insertDup" parameterClass="VELctrDetailVO">
+		/*	VELctrStngDAO.insertDup	*/
 				
-		INSERT INTO <include refid="VELctrStngDAO.table_name"/> (
-			<include refid="VELctrStngDAO.column_name"/>
+		MERGE INTO <include refid="VELctrStngDAO.table_name"/>
+		USING DUAL
+		ON(instr_div=#instrDiv#	AND	user_id=#userId#	AND	lctr_stng_ord=#lctrStngOrd#)				
 		
-		)VALUES(
-			#instrDiv#,
-	        #userId#,
-	        #lctrStngOrd#,
+		WHEN NOT MATCHED THEN
+			INSERT				
+					(
+						<include refid="VELctrStngDAO.column_name"/>
+					)
+			VALUES(			
 		
-	       	#sunLctrYn#,
-	       	#monLctrYn#,
-	       	#tueLctrYn#,
-	       	#wedLctrYn#,
-	       	#thuLctrYn#,
-	       	#friLctrYn#,
-	       	#satLctrYn#,
-	       	#zoomYn#,
-	       	#yrMxmmAsgnmTm#,
-	       	#mntMnmmTm#,
-	       	#prfrnFldCd#,
-	       	#onlnPsblYn#,
+					#instrDiv#,
+			        #userId#,
+			        #lctrStngOrd#,
 			        
-	       	#sbmtYn#,
-		<isNotEmpty property="sbmtYn">			
-			SYSDATE,
-		</isNotEmpty>
-		<isEmpty property="sbmtYn">
-	       	#sbmtPnttm#,
-		</isEmpty>			       	
+			       	#sunLctrYn#,
+			       	#monLctrYn#,
+			       	#tueLctrYn#,
+			       	#wedLctrYn#,
+			       	#thuLctrYn#,
+			       	#friLctrYn#,
+			       	#satLctrYn#,
+			       	#zoomYn#,
+			       	#yrMxmmAsgnmTm#,
+			       	#mntMnmmTm#,
+			       	#prfrnFldCd#,
+			       	#onlnPsblYn#,
 			       	
-			#aprvlCd#,
-		<isNotEmpty property="aprvlCd">	       	
-	       	SYSDATE,
-		</isNotEmpty>
-		<isEmpty property="aprvlCd">	       	
-	       	#aprvlPnttm#,
-		</isEmpty>		
+			       	#sbmtYn#,
+				<isNotEmpty property="sbmtYn">			
+					SYSDATE,
+				</isNotEmpty>
+				<isEmpty property="sbmtYn">
+			       	#sbmtPnttm#,
+				</isEmpty>			       	
 		
-	       	#aprvlId#,
-       		#aprvlCn#,	
+					#aprvlCd#,
+				<isNotEmpty property="aprvlCd">	       	
+			       	SYSDATE,
+				</isNotEmpty>
+				<isEmpty property="aprvlCd">	       	
+			       	#aprvlPnttm#,
+				</isEmpty>		
 				
-       		SYSDATE,
-       		#frstRegisterId#,
-       		SYSDATE,
-       		#lastUpdusrId#,
+			       	#aprvlId#,
+		       		#aprvlCn#,	
 			       			
-       		#useYn#,
+		       		SYSDATE,
+		       		#frstRegisterId#,
+		       		SYSDATE,
+		       		#lastUpdusrId#,
 		       		
-       		#isltnPsblYn#,      	
-	       	#cntnsLctrPsblYn#,
+		       		#useYn#,
 		       		
-	       	#lctrStngYr#,
-	       	#asgnmTm1#,
-	       	#asgnmTm2#,
-	       	#asgnmTm3#,
-	       	#asgnmTm4#,
-	       	#asgnmTm5#,
-	       	#asgnmTm6#,
-	       	#asgnmTm7#,
-	       	#asgnmTm8#,
-	       	#asgnmTm9#,
-	       	#asgnmTm10#,
-	       	#asgnmTm11#,
-	       	#asgnmTm12#	
-		)
+		       		#isltnPsblYn#,      	
+			       	#cntnsLctrPsblYn#,
 			       	
-		ON DUPLICATE KEY UPDATE 
-			last_updt_pnttm=SYSDATE 
-			, last_updusr_id=#frstRegisterId#		
+			       	#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
 											
-		<isNotEmpty property="sunLctrYn">
-			, sun_lctr_yn			=#sunLctrYn#
-		</isNotEmpty><isNotEmpty property="monLctrYn">
-			, mon_lctr_yn				=#monLctrYn#
-		</isNotEmpty><isNotEmpty property="tueLctrYn">
-			, tue_lctr_yn				=#tueLctrYn#
-		</isNotEmpty><isNotEmpty property="wedLctrYn">
-			, wed_lctr_yn				=#wedLctrYn#
-		</isNotEmpty><isNotEmpty property="thuLctrYn">
-			, thu_lctr_yn				=#thuLctrYn#
-		</isNotEmpty><isNotEmpty property="friLctrYn">
-			, fri_lctr_yn				=#friLctrYn#
-		</isNotEmpty><isNotEmpty property="satLctrYn">
-			, sat_lctr_yn		=#satLctrYn#
+				<isNotEmpty property="sunLctrYn">
+					, sun_lctr_yn			=#sunLctrYn#
+				</isNotEmpty><isNotEmpty property="monLctrYn">
+					, mon_lctr_yn				=#monLctrYn#
+				</isNotEmpty><isNotEmpty property="tueLctrYn">
+					, tue_lctr_yn				=#tueLctrYn#
+				</isNotEmpty><isNotEmpty property="wedLctrYn">
+					, wed_lctr_yn				=#wedLctrYn#
+				</isNotEmpty><isNotEmpty property="thuLctrYn">
+					, thu_lctr_yn				=#thuLctrYn#
+				</isNotEmpty><isNotEmpty property="friLctrYn">
+					, fri_lctr_yn				=#friLctrYn#
+				</isNotEmpty><isNotEmpty property="satLctrYn">
+					, sat_lctr_yn		=#satLctrYn#
 								
-		</isNotEmpty><isNotEmpty property="zoomYn">
-			, zoom_yn			=#zoomYn#
-		</isNotEmpty><isNotEmpty property="yrMxmmAsgnmTm">
-			, yr_mxmm_asgnm_tm		=#yrMxmmAsgnmTm#
-		</isNotEmpty><isNotEmpty property="mntMnmmTm">
-			, mnt_mnmm_tm				=#mntMnmmTm#
-		</isNotEmpty><isNotEmpty property="prfrnFldCd">
-			, prfrn_fld_cd			=#prfrnFldCd#
-		</isNotEmpty><isNotEmpty property="onlnPsblYn">
-			, onln_psbl_yn			=#onlnPsblYn#
-		</isNotEmpty><isNotEmpty property="useYn">
-			, use_yn		=#useYn#
-		</isNotEmpty><isNotEmpty property="isltnPsblYn">
-			, isltn_psbl_yn		=#isltnPsblYn#
-		</isNotEmpty><isNotEmpty property="cntnsLctrPsblYn">
-			, cntns_lctr_psbl_yn				=#cntnsLctrPsblYn#
-		</isNotEmpty><isNotEmpty property="lctrStngYr">
-			, lctr_stng_yr				=#lctrStngYr#
-		</isNotEmpty>		 
+				</isNotEmpty><isNotEmpty property="zoomYn">
+					, zoom_yn			=#zoomYn#
+				</isNotEmpty><isNotEmpty property="yrMxmmAsgnmTm">
+					, yr_mxmm_asgnm_tm		=#yrMxmmAsgnmTm#
+				</isNotEmpty><isNotEmpty property="mntMnmmTm">
+					, mnt_mnmm_tm				=#mntMnmmTm#
+				</isNotEmpty><isNotEmpty property="prfrnFldCd">
+					, prfrn_fld_cd			=#prfrnFldCd#
+				</isNotEmpty><isNotEmpty property="onlnPsblYn">
+					, onln_psbl_yn			=#onlnPsblYn#
+				</isNotEmpty><isNotEmpty property="useYn">
+					, use_yn		=#useYn#
+				</isNotEmpty><isNotEmpty property="isltnPsblYn">
+					, isltn_psbl_yn		=#isltnPsblYn#
+				</isNotEmpty><isNotEmpty property="cntnsLctrPsblYn">
+					, cntns_lctr_psbl_yn				=#cntnsLctrPsblYn#
+				</isNotEmpty><isNotEmpty property="lctrStngYr">
+					, lctr_stng_yr				=#lctrStngYr#
+				</isNotEmpty>			
 		   	
 	</insert>
 		
--- 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 @@
 					<button type="button" class="btn_type03" onclick="fncSndEmail();return false;">테스트 이메일 발송</button>
 				</div>	
 			</div>
+			<!-- 
 <br/>----------하기는 메일 발송 계정 관련 내용임(테스트용)-----------------------------------------------------------------------
 			<div class="btn_wrap btn_layout01">
 				<div class="btn_right">
@ -222,7 +223,7 @@
 		<br/>//1. sndFlag = 메뉴 구분
 		<br/>//			 C -> 기존계정 발송
 		<br/>//			 UR -> 입력한 ID/PWD로 발송			
-				
+				 -->
 		</div>
 	</div>
 </div>
--- 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 @@
 					
 						<c:forEach var="asgnmInfoT2" items="${vEInstrAssiEduAplctVOList}" varStatus="status">
 						<tr>
-							<td><c:out value="${asgnmInfoT2.yr}" />
+							<td>
 										<c:out value="${asgnmInfoT2.instrNm}"/>
 										<c:if test="${asgnmInfoT2.instrNm ne null}">
 											<br/>(${fn:split(asgnmInfoT2.userId,'_')[1]*1})
--- 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 + "명";