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

src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml

@@ -209,10 +209,17 @@
 	<!-- 강사 등록 C -->
 	<insert id="VEInstrDetailDAO.insertDup" parameterClass="VEInstrDetailVO">			
 		/*	VEInstrDetailDAO.insertDup	*/
-		INSERT INTO <include refid="VEInstrDetailDAO.table_name"/> (
-			<include refid="VEInstrDetailDAO.column_name"/>
 		
-		)VALUES(
+		MERGE INTO <include refid="VEInstrDetailDAO.table_name"/>
+		USING DUAL
+		ON(instr_nm=#instrNm#	AND	phone=#phone#)				
+		
+		WHEN NOT MATCHED THEN
+			INSERT				
+					(
+						<include refid="VEInstrDetailDAO.column_name"/>
+					)
+			VALUES(			
 				#instrDiv#,
 		       	#userId#,
 		       	#instrDetailOrd#,
@@ -261,18 +268,16 @@
 	       		#apptDt#,       		
 	       		#hchkDt#,
 	       		#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 
-			, 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#
@@ -308,6 +313,10 @@
 					, 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>	

src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml

@@ -3793,5 +3793,7 @@
 			,last_updusr_id = #rqstId#
 		WHERE instr_detail_ord = #instrDetailOrd#
 			AND instr_div = #instrDiv#
+			AND user_id = #userId#			
+		
 	</update>
 </sqlMap>

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,11 +185,19 @@
 	</insert>
 	
 	<insert id="VELctrStngDAO.insertDup" parameterClass="VELctrDetailVO">
+		/*	VELctrStngDAO.insertDup	*/
 				
-		INSERT INTO <include refid="VELctrStngDAO.table_name"/> (
+		MERGE INTO <include refid="VELctrStngDAO.table_name"/>
+		USING DUAL
+		ON(instr_div=#instrDiv#	AND	user_id=#userId#	AND	lctr_stng_ord=#lctrStngOrd#)				
+		
+		WHEN NOT MATCHED THEN
+			INSERT				
+					(
 						<include refid="VELctrStngDAO.column_name"/>
+					)
+			VALUES(			
 		
-		)VALUES(
 					#instrDiv#,
 			        #userId#,
 			        #lctrStngOrd#,
@@ -250,10 +258,10 @@
 			       	#asgnmTm11#,
 			       	#asgnmTm12#	
 			)		
-		
+		WHEN MATCHED THEN
-		ON DUPLICATE KEY UPDATE 
+			UPDATE
-			last_updt_pnttm=SYSDATE 
+				SET last_updusr_id 	= #frstRegisterId#
-			, last_updusr_id=#frstRegisterId#		
+					, last_updt_pnttm 	= SYSDATE
 											
 				<isNotEmpty property="sunLctrYn">
 					, sun_lctr_yn			=#sunLctrYn#

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>

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})

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 + "명";