From 7a2dad9e2763a1fce75f2d3feffc60c11ad3dcc5 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Tue, 19 Mar 2024 12:07:44 +0900
Subject: [PATCH] =?UTF-8?q?2024-03-19=2012:07=20=EA=B0=95=EC=82=AC=20?=
 =?UTF-8?q?=EA=B0=95=EC=9D=98=EC=9A=94=EC=B2=AD=EB=A6=AC=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml       | 26 +++++++++++++++----
 .../asgnmInfo/instrAsgnmRqstList.jsp          |  8 +++---
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml
index 59b0016d..ab7c1fbe 100644
--- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml
@@ -1114,17 +1114,33 @@
 	<!-- 배정내역 테이블 등록 -->
 	<insert id="VEAsgnmMIXDAO.insertAsgnmHstry" parameterClass="VEInstrAsgnmVO">
 				/*	VEAsgnmMIXDAO.insertAsgnmHstry	*/
-		INSERT INTO ve_edu_chasi_instr_asgnm_hstry(
+		
+		MERGE INTO ve_edu_chasi_instr_asgnm_hstry T1 
+		USING DUAL
+		ON (
+				T1.edu_aplct_ord 		= #eduAplctOrd# 
+				AND T1.edu_chasi_ord 	= #eduChasiOrd#
+				AND T1.user_id			= #userId#
+				AND T1.hstry_cd 		= #hstryCd#
+				)
+		WHEN MATCHED THEN
+			UPDATE SET
+				frst_regist_pnttm	=	SYSDATE				
+		WHEN NOT MATCHED THEN
+		INSERT (
 			edu_aplct_ord,
 			edu_chasi_ord,
 			user_id,
-			hstry_cd
-		)VALUES(
+			hstry_cd,
+			frst_regist_pnttm
+		) VALUES (
 			#eduAplctOrd#,
        		#eduChasiOrd#,
 			#userId#,
-			#hstryCd#
-		) 
+			#hstryCd#,
+			SYSDATE
+		)		
+		
 	</insert>	
 	
 	<!-- 배정내역 테이블 삭제 -->
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp
index 157baa8c..a3647bd3 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp
@@ -386,13 +386,15 @@
 									<!-- 배정 수락 요청 상태 -->
 									<c:set var="statCd" value="대기" />									
 								</c:when>
-								<c:when test="${(list.asgnmAprvlCd eq '40' and list.userId eq loginVO.id) or 
-										(list.hstryUserId eq loginVO.id and (list.hstryCd eq '10' or list.hstryCd eq '40'))}">
+								<c:when test="${
+								(list.asgnmAprvlCd eq '40' and list.userId eq '') or 
+										(list.hstryUserId ne list.userId and (list.hstryCd eq '10' or list.hstryCd eq '40'))
+										}">
 								<!-- 배정 거절 or 내역 거절 or 내열에 변경요청 -->
 									<c:set var="statCd" value="거절" />
 								
 								</c:when>
-								<c:when test="${list.asgnmAprvlCd eq '30' and list.userId eq loginVO.id}">
+								<c:when test="${list.asgnmAprvlCd eq '30' and list.hstryCd eq ''}">
 									<c:set var="statCd" value="수락" />
 								</c:when>
 							</c:choose>