From c2edcd20238ddd473d49157fb3b854b53228a2fb Mon Sep 17 00:00:00 2001 From: jiwoo Date: Wed, 20 Dec 2023 11:09:05 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B5=90?= =?UTF-8?q?=EC=9C=A1=20=EC=8B=A0=EC=B2=AD=20=EA=B3=B5=ED=86=B5=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EC=BF=BC=EB=A6=AC=20=EA=B2=80=EC=83=89=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=20=EC=98=A4=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 --- .../egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 6 +++--- .../instr/tngrVisitEdu/instrInfo/popup/instrInfoChkPop.jsp | 2 -- 2 files changed, 3 insertions(+), 5 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 b771f0d5..6e01294e 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 @@ -1516,11 +1516,11 @@ - AND CC.EDU_HOPE_DT = ]]> REPLACE(#searchStartDt#, '.' , '') + AND REPLACE(CC.EDU_HOPE_DT, '.', '') = ]]> REPLACE(#searchStartDt#, '.' , '') - AND CC.EDU_HOPE_DT REPLACE(#searchEndDt#, '.' , '') + AND REPLACE(CC.EDU_HOPE_DT, '.', '') REPLACE(#searchEndDt#, '.' , '') AND TO_CHAR(A.SBMT_PNTTM,'YYYYMMDD') = ]]> REPLACE(#searchStartSbmtPnttm#, '.' , '') @@ -1624,7 +1624,7 @@ - AND A.CHRG_NM LIKE '%' || #searchChrgNm# , '%') + AND A.CHRG_NM LIKE '%' || #searchChrgNm# || '%' diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/popup/instrInfoChkPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/popup/instrInfoChkPop.jsp index 6bd32327..422c8acc 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/popup/instrInfoChkPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/popup/instrInfoChkPop.jsp @@ -13,8 +13,6 @@ + @@ -160,6 +366,9 @@ + + +
@@ -196,7 +405,8 @@

강사명

- + +
@@ -215,69 +425,121 @@

연락처(핸드폰)

- + + + - + + - + +

e-mail

- + + + <%-- --%> + + @ + + + +

주소

-
-   + + + +
+ + + + +

거주지

- + + + + +

생년월일

- + + + + + + + --%> + +

소속

- + + +

직위

- + + +

위촉년도

- + + +

구분

- + + + - + <%--

위촉구분${info.apptDiv}

- + --%>

전문분야

- + @@ -295,6 +557,7 @@ + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctMngDetail.jsp index bbfb924b..127bcf4e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctMngDetail.jsp @@ -28,6 +28,8 @@ 강사정보 상세 + + @@ -284,6 +365,10 @@ + + + +
@@ -450,7 +535,7 @@

구분

- + @@ -459,7 +544,7 @@

위촉구분

- + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctReg.jsp index 4552c076..5cb0b52f 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctReg.jsp @@ -251,11 +251,13 @@ $( document ).ready(function(){ function fncRsdnePopup() { //거주지 팝업 - document.createForm.action = ""; - window.open("#", "_rsdnePopup", "scrollbars = no, top=200px, left=2500px, height=500px, width=700px"); + /* document.createForm.action = ""; + window.open('', "_rsdnePopup", "scrollbars = no, top=200px, left=2500px, height=500px, width=700px"); document.createForm.target = "_rsdnePopup"; document.createForm.formId.value = "createForm"; - document.createForm.submit(); + document.createForm.submit(); */ + + commonPopWindowopenForm("${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/popup/instrRsdnePopup.do", "750", "660", "rsdnePopup", $('#createForm')); } function fncPhotoPopup() { diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctRegExcel.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctRegExcel.jsp index d8922b71..17cdc462 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctRegExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctRegExcel.jsp @@ -410,7 +410,7 @@ $( document ).ready(function(){ - ※ 컴퓨터 파일(엑셀)만 등록 가능합니다.sample + ※ 컴퓨터 파일(엑셀)만 등록 가능합니다.sample diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctStngExcel.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctStngExcel.jsp index 81f11d43..6e7f1ef1 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctStngExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctStngExcel.jsp @@ -410,7 +410,7 @@ $( document ).ready(function(){ - ※ 컴퓨터 파일(엑셀)만 등록 가능합니다.sample + ※ 컴퓨터 파일(엑셀)만 등록 가능합니다.sample