From d6a7927309f931844d63a38d73519b5b11063562 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Mon, 18 Sep 2023 11:56:09 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=B2=B4?= =?UTF-8?q?=ED=97=98=EA=B5=90=EC=8B=A4=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/uat/uia/web/APILoginContoller.java | 3 ++- .../web/OprtnAplctAnncmMngController.java | 5 ++++- .../let/cmm/fms/EgovFile_SQL_Tibero.xml | 4 ++-- .../ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 6 +++--- .../sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml | 2 +- .../oprtnAplctAnncmMngDetail.jsp | 8 ++++++-- .../oprtnAplctAnncmMngList.jsp | 5 +---- .../cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp | 20 +++++++++++++++++-- .../oprtnAplctAnncmMngUpdate.jsp | 6 +----- .../adm/publish/datepicker/classic.css | 2 +- 10 files changed, 39 insertions(+), 22 deletions(-) diff --git a/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java b/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java index 591b92ff..2b1a5c4b 100644 --- a/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java +++ b/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java @@ -70,7 +70,8 @@ public class APILoginContoller { public String loginKeyChkForOffedu(Map paramRequest, RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response,HttpSession session) throws Exception { String userId = paramRequest.get("user_id"); String key = paramRequest.get("key"); - String returnUrl = paramRequest.get("returnUrl"); + //String returnUrl = paramRequest.get("returnUrl"); //e-배움터 문의결과 returnUrl 컨트롤은 불가능하다고 함 + String returnUrl = ""; System.out.println("@@@@@@@e배움터 로그인 페이지에서 오는 메소드 or e배움터 로그인 상태에서 오는 메소드@@@@@@@@"); //테스트를 위한 값 선언 diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java index 229bb045..4b218487 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java @@ -132,7 +132,7 @@ public class OprtnAplctAnncmMngController { */ @RequestMapping("oprtnAplctAnncmMngList.do") public String OprtnAplctAnncmMngList( - @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + VEPrcsDetailVO vEPrcsDetailVO , ModelMap model ) throws Exception { @@ -144,6 +144,9 @@ public class OprtnAplctAnncmMngController { //로그인 처리==================================== + //체험교실 구분값 + vEPrcsDetailVO.setLctrDivCd("30"); + //1.pageing step1 PaginationInfo paginationInfo = this.setPagingStep1(vEPrcsDetailVO); diff --git a/src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml index 8082e0c5..11aae0cb 100644 --- a/src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml @@ -37,7 +37,7 @@ diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index 598bd2cd..232c0c4c 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -90,9 +90,9 @@ #endPnttm#, #useYn#, - NOW(), + SYSDATE, #frstRegisterId#, - NOW(), + SYSDATE, #lastUpdusrId#, #anncmCn#, @@ -129,7 +129,7 @@ SET - LAST_UPDT_PNTTM = NOW() + LAST_UPDT_PNTTM = SYSDATE ,LAST_UPDUSR_ID = #lastUpdusrId# diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml index 29bd1c83..582b19f7 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml @@ -84,7 +84,7 @@ SET - LAST_UPDT_PNTTM = NOW() + LAST_UPDT_PNTTM = SYSDATE ,LAST_UPDUSR_ID = #lastUpdusrId# , prcs_kind = #prcsKind# diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngDetail.jsp index df10e22d..91f18b7c 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngDetail.jsp @@ -211,6 +211,7 @@ function fncGoList(){ var listForm = document.listForm ; + listForm.prcsAplctPrdOrd.value = ""; //목록 이동 시 searchKeyword 초기화 listForm.action = ""; listForm.submit(); } @@ -220,6 +221,10 @@ listForm.action = ""; listForm.submit(); } + + function fncPreview(){ + alert("개발전") + } @@ -326,7 +331,6 @@ - <%--

안내내용

@@ -344,7 +348,6 @@ - --%>

사용여부

@@ -369,6 +372,7 @@
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngList.jsp index 48b86ee8..3c11e708 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngList.jsp @@ -289,10 +289,7 @@ - - - ~ - + ${list.strtPnttm}~${list.endPnttm} diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp index bb11f7fc..b14d6d1a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp @@ -153,7 +153,6 @@ alert("종료일을 입력해주세요."); return false; } - /* if($("#anncmCn").val() == ""){ alert("안내내용을 입력해주세요."); return false; @@ -162,7 +161,6 @@ alert("팝업내용을 입력해주세요."); return false; } - */ //첨부파일 등록 처리 $('#file_temp').val(""); //첨부파일 중복 등록 방지를 위해 추가 @@ -467,6 +465,24 @@ --> + + +

필수입력 항목*

+

안내내용

+ + + + + + + +

필수입력 항목*

+

팝업내용

+ + + + +

필수입력 항목*

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp index d6c2eba0..944388db 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp @@ -126,7 +126,6 @@ alert("종료일을 입력해주세요."); return false; } - /* if($("#anncmCn").val() == ""){ alert("안내내용을 입력해주세요."); return false; @@ -135,7 +134,6 @@ alert("팝업내용을 입력해주세요."); return false; } - */ //첨부파일 등록 처리 $('#file_temp').val(""); //첨부파일 중복 등록 방지를 위해 추가 @@ -299,7 +297,7 @@

제목

- + @@ -428,7 +426,6 @@ - <%--

필수입력 항목*

@@ -448,7 +445,6 @@ - --%>

필수입력 항목*

diff --git a/src/main/webapp/visitEdu/adm/publish/datepicker/classic.css b/src/main/webapp/visitEdu/adm/publish/datepicker/classic.css index 62bbd469..7ad48cb5 100644 --- a/src/main/webapp/visitEdu/adm/publish/datepicker/classic.css +++ b/src/main/webapp/visitEdu/adm/publish/datepicker/classic.css @@ -23,7 +23,7 @@ .picker__input { width: 180px; cursor: default; - background-image: url(../../image/content/calendarIcon.png); + background-image: url(../image/content/calendarIcon.png); background-repeat: no-repeat; background-position: 90% 45%; }