From da87971f404440193d459c6f834b77da34269279 Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 29 Mar 2024 11:00:32 +0900 Subject: [PATCH] =?UTF-8?q?2024-03-29=2011:00=20=EC=B2=B4=ED=97=98?= =?UTF-8?q?=EA=B5=90=EC=8B=A4=20=EC=9D=B4=EC=88=98=EC=A6=9D=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 11 ++++++++++- .../ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml | 2 ++ .../sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml | 6 +++++- .../jsp/oprtn/cndtnSspnIdtmt/newEduPrfrmMngList.jsp | 2 -- .../fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp | 3 ++- .../WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp | 3 ++- 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index 01e702d5..ba34144d 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -128,8 +128,12 @@ vadi.APLCT_STATE_CD AS aplctStateCd, /* 이수 상태 */ vadi.CNCL_ATCH_FILE_ID AS cnclAtchFileId, vadi.CNCL_CN AS cnclCn, + /* le.MBER_NM AS userNm, le.MBER_ID AS mberId, + */ + a.chrg_nm AS userNm, + le.ESNTL_ID AS mberId, , a.CHRG_NM AS chrgNm , a.D_BIRTH AS dBirth , @@ -271,9 +275,13 @@ SELECT vadi.APLCT_STATE_CD AS aplctStateCd, /* 이수 상태 */ vadi.CNCL_ATCH_FILE_ID AS cnclAtchFileId, - vadi.CNCL_CN AS cnclCn, + vadi.CNCL_CN AS cnclCn, + /* le.MBER_NM AS userNm, le.MBER_ID AS mberId, + */ + a.chrg_nm AS userNm, + le.ESNTL_ID AS mberId, , a.CHRG_NM AS chrgNm , a.D_BIRTH AS dBirth , @@ -499,6 +507,7 @@ vsit.edu_state_cd AS eduStateCd, le.MBER_NM AS userNm, le.MBER_ID AS mberId, + , vsit.trgt_nm AS trgtNm, vsit.sspn_idtmt_trgt_ord AS sspnIdtmtTrgtOrd, diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml index d1aeff0c..4a2a6991 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Tibero.xml @@ -232,6 +232,8 @@ TO_CHAR(a.LAST_UPDT_PNTTM,'YYYYMMDD') REPLACE(#searchEndDt#, '.' , '') + ORDER BY a.EDU_CMPLT_CRTFC_NMBR desc + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml index b711b923..4b318fc8 100644 --- a/src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml @@ -24,8 +24,12 @@ SELECT l.mber_id AS mberId + /* , l.mber_nm AS mberNm , l.birth_day AS birthDay + */ + , vea.chrg_nm AS mberNm + , vea.d_birth AS birthDay , vpap.edu_strt_pnttm AS eduStrtPnttm , vpap.edu_ddln_pnttm AS eduDdlnPnttm , vp.prcs_nm AS prcsNm @@ -77,7 +81,7 @@ AND vadi.PRCS_APLCT_PRD_ORD =vpap.PRCS_APLCT_PRD_ORD AND vadi.edu_aplct_ord=#eduAplctOrd# AND vadi.EDU_APLCT_ORD =vea.edu_aplct_ord - AND l.mber_id=vea.user_id + AND l.esntl_id=vea.user_id LIMIT 1 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/newEduPrfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/newEduPrfrmMngList.jsp index 563e092c..bab10ed8 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/newEduPrfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/newEduPrfrmMngList.jsp @@ -527,8 +527,6 @@ - - diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp index e4d5feeb..ae1dfbf9 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp @@ -997,7 +997,8 @@ var viewer = new m2soft.crownix.Viewer('http://119.193.215.98:8093/ReportingServer/service'); viewer.hideToolbarItem(["save"]); viewer.showToolbarItem(["print_pdf"]); - viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']'); + //viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']'); + viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://192.168.0.32:3080/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']'); } } diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp index 4bce2620..3a8f226e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp @@ -634,7 +634,8 @@ viewer.hideToolbarItem(["save"]); viewer.showToolbarItem(["print_pdf"]); viewer.useWebFont(true); - viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']'); + //viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']'); + viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://192.168.0.32:3080/offedu/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']'); } } \ No newline at end of file