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 @@ /* 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 + ) + 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 @@ - + - +