From 30fa8b70af6ac00558761e00b8dcb2ef9c2b0c98 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Wed, 8 Nov 2023 12:49:30 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=A0=80?= =?UTF-8?q?=EC=9E=91=EA=B6=8C=EC=B2=B4=ED=97=98=EA=B5=90=EC=8B=A4=20?= =?UTF-8?q?=EC=9A=B4=EC=98=81=EC=8B=A0=EC=B2=AD=20=EC=95=88=EB=82=B4(?= =?UTF-8?q?=EC=8B=A0=EC=B2=AD=EA=B8=B0=EA=B0=84)=20=EA=B8=B0=EA=B0=84?= =?UTF-8?q?=EC=97=90=20=EC=8B=9C=EA=B0=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/ExprnClsrmAplctController.java | 7 +- .../web/OprtnAplctAnncmMngController.java | 12 +- .../ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 7 +- .../oprtnAplctAnncmMngDetail.jsp | 4 +- .../cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp | 159 +++++++++++++++--- .../oprtnAplctAnncmMngUpdate.jsp | 141 +++++++++++++++- .../exprnClsrmInfo/exprnClsrmAplctGuide.jsp | 2 +- .../exprnClsrmInfo/popup/cautionGuide.jsp | 8 +- 8 files changed, 297 insertions(+), 43 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java index 768110a9..8f95cbab 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java @@ -206,21 +206,24 @@ public class ExprnClsrmAplctController { SimpleDateFormat simpleStrFormat = new SimpleDateFormat("yyyy년 MM월 dd일"); SimpleDateFormat simpleStrFormatEnd = new SimpleDateFormat("MM월 dd일"); + SimpleDateFormat simpleStrFormatTm = new SimpleDateFormat("HH:mm"); //시작일자 날짜 형식 변환 Date stDate = simpleDateFormat.parse(detailVO.getStrtPnttm()); String stDay = simpleStrFormat.format(stDate); + String stTm = simpleStrFormatTm.format(stDate); //종료일자 날짜 형식 변환 Date edDate = simpleDateFormat.parse(detailVO.getEndPnttm()); String edDay = simpleStrFormatEnd.format(edDate); + String edTm = simpleStrFormatTm.format(edDate); //요일 텍스트 받아오기 String strWeekStart = DateUtil.getWeekText(stDate); String strWeekEnd = DateUtil.getWeekText(edDate); - detailVO.setStrtPnttm(stDay + "(" + strWeekStart + ")"); - detailVO.setEndPnttm(edDay + "(" + strWeekEnd + ")"); + detailVO.setStrtPnttm(stDay + "(" + strWeekStart + ") "+stTm); + detailVO.setEndPnttm(edDay + "(" + strWeekEnd + ") "+edTm); model.addAttribute("detailVO", detailVO); 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 89a1727b..07e63813 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 @@ -403,10 +403,10 @@ public class OprtnAplctAnncmMngController { System.out.println(vEPrcsDetailVO.getStrtPnttm()); System.out.println(vEPrcsDetailVO.getEndPnttm()); - String strtPnttm = vEPrcsDetailVO.getStrtPnttm().replaceAll("[.]", "").trim(); - strtPnttm = strtPnttm+ "0000"; - String endPnttm = vEPrcsDetailVO.getEndPnttm().replaceAll("[.]", "").trim(); - endPnttm = endPnttm+ "0000"; + String strtPnttm = vEPrcsDetailVO.getStrtPnttm().replaceAll("[.]", "").replaceAll(":", "").trim(); +// strtPnttm = strtPnttm+ "0000"; + String endPnttm = vEPrcsDetailVO.getEndPnttm().replaceAll("[.]", "").replaceAll(":", "").trim(); +// endPnttm = endPnttm+ "0000"; vEPrcsDetailVO.setStrtPnttm(strtPnttm); vEPrcsDetailVO.setEndPnttm(endPnttm); @@ -482,11 +482,11 @@ public class OprtnAplctAnncmMngController { System.out.println(vEPrcsDetailVO.getStrtPnttm()); System.out.println(vEPrcsDetailVO.getEndPnttm()); - String strtPnttm = vEPrcsDetailVO.getStrtPnttm().replaceAll("[.]", "").trim()+"0000"; + String strtPnttm = vEPrcsDetailVO.getStrtPnttm().replaceAll("[.]", "").replaceAll(":", "").trim(); // String strtPnttm = vEPrcsDetailVO.getStrtPnttm().replace(".", "").trim(); // strtPnttm = strtPnttm.substring(2, strtPnttm.length()) + "000000"; - String endPnttm = vEPrcsDetailVO.getEndPnttm().replaceAll("[.]", "").trim()+"0000"; + String endPnttm = vEPrcsDetailVO.getEndPnttm().replaceAll("[.]", "").replaceAll(":", "").trim(); // String endPnttm = vEPrcsDetailVO.getEndPnttm().replace(".", "").trim(); // endPnttm = endPnttm.substring(2, endPnttm.length()) + "000000"; 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 c37eb948..554df6aa 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 @@ -208,7 +208,12 @@ 1=1 AND a.USE_YN = 'Y' - AND TO_CHAR(SYSDATE, 'YYYYMMDD') BETWEEN SUBSTR(a.strt_pnttm,1,8) AND SUBSTR(a.end_pnttm,1,8) + + AND TO_CHAR(SYSDATE, 'YYYYMMDDHH24MI') BETWEEN a.strt_pnttm AND a.end_pnttm + + + AND TO_CHAR(SYSDATE, 'YYYYMMDD') BETWEEN SUBSTR(a.strt_pnttm,1,8) AND SUBSTR(a.end_pnttm,1,8) + AND a.lctr_div_cd=#lctrDivCd# 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 1587b8d8..7540d084 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngDetail.jsp @@ -323,8 +323,8 @@ - ~ - + ~ + 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 1166a07c..b966cd5e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp @@ -7,6 +7,7 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> <% /** @@ -145,14 +146,22 @@ alert("제목을 입력해주세요."); return false; } - if($("#strtPnttm").val() == ""){ + if($("#strtPnttmDay").val() == ""){ alert("시작일을 입력해주세요."); return false; } - if($("#endPnttm").val() == ""){ + if($("#strtPnttmTime").val() == ""){ + alert("시작시간 입력해주세요."); + return false; + } + if($("#endPnttmDay").val() == ""){ alert("종료일을 입력해주세요."); return false; } + if($("#endPnttmTime").val() == ""){ + alert("종료일시간을 입력해주세요."); + return false; + } /* if($("#anncmCn").val() == ""){ alert("안내내용을 입력해주세요."); return false; @@ -165,6 +174,8 @@ //첨부파일 등록 처리 $('#file_temp').val(""); //첨부파일 중복 등록 방지를 위해 추가 //var data = new FormData(form); + $("input[name=strtPnttm]").val($("input[name=strtPnttmDay]").val() + $("input[name=strtPnttmTime]").val()) + $("input[name=endPnttm]").val($("input[name=endPnttmDay]").val() + $("input[name=endPnttmTime]").val()) var data = new FormData(document.getElementById("createForm")); //첨부파일 등록 처리-step1 @@ -265,8 +276,11 @@ + + +
@@ -299,22 +313,6 @@ - <%-- - - 구분 - - - - - - 과정명 - - - - - - --%> -

필수입력 항목*

@@ -336,13 +334,132 @@
- + +
+
+
+ +
+
+

시간 선택

+
+
+
+ +
+ : +
+ +
+
+ +
+
~
- +
- +
+
+ +
+
+

시간 선택

+
+
+
+ +
+ : +
+ +
+
+ +
+
+
<%--
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 db9d4cd3..9ff43a4f 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp @@ -118,14 +118,22 @@ alert("제목을 입력해주세요."); return false; } - if($("#startDate01").val() == ""){ + if($("#strtPnttmDay").val() == ""){ alert("시작일을 입력해주세요."); return false; } - if($("#endDate").val() == ""){ + if($("#strtPnttmTime").val() == ""){ + alert("시작시간 입력해주세요."); + return false; + } + if($("#endPnttmDay").val() == ""){ alert("종료일을 입력해주세요."); return false; } + if($("#endPnttmTime").val() == ""){ + alert("종료일시간을 입력해주세요."); + return false; + } /* if($("#anncmCn").val() == ""){ alert("안내내용을 입력해주세요."); return false; @@ -138,6 +146,8 @@ //첨부파일 등록 처리 $('#file_temp').val(""); //첨부파일 중복 등록 방지를 위해 추가 //var data = new FormData(form); + $("input[name=strtPnttm]").val($("input[name=strtPnttmDay]").val() + $("input[name=strtPnttmTime]").val()) + $("input[name=endPnttm]").val($("input[name=endPnttmDay]").val() + $("input[name=endPnttmTime]").val()) var data = new FormData(document.getElementById("createForm")); //첨부파일 등록 처리-step1 @@ -240,6 +250,8 @@ + +
@@ -319,13 +331,132 @@
- ""> + "> +
+
+
+ "> +
+
+

시간 선택

+
+
+
+ +
+ : +
+ +
+
+ +
+
~
- "> + ">
- +
+
+ "> +
+
+

시간 선택

+
+
+
+ +
+ : +
+ +
+
+ +
+
+
<%--
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp index 388ea4b8..f8248a2b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp @@ -18,7 +18,7 @@ } function openPop(){ - //if(!checkAplctPsbl()) return; + /* if(!checkAplctPsbl()) return; */ if(${detailVO == null}){ alert("신청기간이 아닙니다."); return false; diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/cautionGuide.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/cautionGuide.jsp index 003e2bb7..19f3c052 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/cautionGuide.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/cautionGuide.jsp @@ -37,9 +37,7 @@ } function goMain(){ - var frm = document.getElementById("prcsOrdForm"); - frm.action = ""; - frm.submit(); + location.href=""; } @@ -58,10 +56,10 @@
알려드립니다
-
년도 저작권 체험교실 운영 신청은 ~ ,
9:00 ~ 18:00에 진행되오니 많은 관심 부탁드립니다. 감사합니다.
+
년도 저작권 체험교실 운영 신청은 ~
에 진행되오니 많은 관심 부탁드립니다. 감사합니다.
 -
년도 저작권 체험교실 운영 신청은 ~ ,
9:00 ~ 18:00에 진행되었습니다.
현재는 신청기간이 아니므로 찾아가는 저작권 교육을 이용하여 주시기 바랍니다. 감사합니다.
+
년도 저작권 체험교실 운영 신청은 ~
에 진행되었습니다.
현재는 신청기간이 아니므로 찾아가는 저작권 교육을 이용하여 주시기 바랍니다. 감사합니다.