From ea6c4a40c578b831c9f0c48cb53e8bb5bfab9a41 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Wed, 24 Jan 2024 15:07:26 +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=8B=A0=EC=B2=AD=EC=84=9C=20=EC=97=85=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ExprnClsrmAplctServiceImpl.java | 3 + .../impl/OprtnAplctMngServiceImpl.java | 6 + .../ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 2 - .../oprtnAplctAnncmMngDetail.jsp | 8 ++ .../cpyrgExprnClsrm/oprtnAplctMngDetail.jsp | 27 ++++ .../cpyrgExprnClsrm/oprtnAplctMngReg.jsp | 24 +++- .../exprnClsrmEnd/exprnClsrmEndDetail.jsp | 40 ++++++ .../exprnClsrmInfo/exprnAplctDashboard.jsp | 29 ++++ .../exprnClsrmInfo/exprnClsrmAplctDetail.jsp | 39 ++++++ .../exprnClsrmInfo/exprnClsrmAplctReg.jsp | 124 +++++++++++++++++- .../exprnClsrmInfo/exprnRsltDashboard.jsp | 39 ++++++ 11 files changed, 330 insertions(+), 11 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/impl/ExprnClsrmAplctServiceImpl.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/impl/ExprnClsrmAplctServiceImpl.java index 293ac711..af365ab9 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/impl/ExprnClsrmAplctServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/service/impl/ExprnClsrmAplctServiceImpl.java @@ -122,6 +122,9 @@ public class ExprnClsrmAplctServiceImpl implements ExprnClsrmAplctService { String eduAplctOrd = eduAplctGnrService.getNextStringId(); // 고유ID vEEduAplctVO.setEduAplctOrd(eduAplctOrd); vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_30); //강의 구분 코드 체험교실 + if("30".equals(vEEduAplctVO.getLctrDivCd())){ + vEEduAplctVO.setScholSealAtchFileId(s_scholSealAtchFileId); + } //vEEduAplctVO.setScholSealAtchFileId(s_scholSealAtchFileId); //학교장직인 첨부파일 vEEduAplctVO.setUserId(loginVO.getUniqId()); vEEduAplctVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/service/impl/OprtnAplctMngServiceImpl.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/service/impl/OprtnAplctMngServiceImpl.java index b73667af..4b2ef329 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/service/impl/OprtnAplctMngServiceImpl.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/service/impl/OprtnAplctMngServiceImpl.java @@ -118,6 +118,9 @@ public class OprtnAplctMngServiceImpl implements OprtnAplctMngService { vEEduAplctVO.setEduAplctOrd(eduAplctOrd); vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_30); //강의 구분 코드 체험교실 vEEduAplctVO.setOprtnFileId(s_scholSealAtchFileId); //학교장직인 첨부파일 + if("30".equals(vEEduAplctVO.getLctrDivCd())){ + vEEduAplctVO.setScholSealAtchFileId(s_scholSealAtchFileId); + } if(!"Y".equals(vEEduAplctVO.getAdminInsert())) { vEEduAplctVO.setUserId(loginVO.getUniqId()); vEEduAplctVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id @@ -192,6 +195,9 @@ public class OprtnAplctMngServiceImpl implements OprtnAplctMngService { //step3.파일 처리==================================== vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_30); //강의 구분 코드 체험교실 vEEduAplctVO.setOprtnFileId(s_scholSealAtchFileId); //학교장직인 첨부파일 + if("30".equals(vEEduAplctVO.getLctrDivCd())){ + vEEduAplctVO.setScholSealAtchFileId(s_scholSealAtchFileId); + } if(!"Y".equals(vEEduAplctVO.getAdminInsert())) { vEEduAplctVO.setUserId(loginVO.getUniqId()); vEEduAplctVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id 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 3b8aed39..2ee220b5 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 @@ -200,9 +200,7 @@ , title = #title# - , anncm_cn = #anncmCn# - , popup_cn = #popupCn# 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 acb17dbd..9cd0d28f 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngDetail.jsp @@ -375,6 +375,14 @@ --%> + + +

내용

+ + + + +

사용여부

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp index b6fe604a..ceb9006e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp @@ -386,6 +386,33 @@ --%> + + + +
+

신청서

+
+
+ + + + + + + + + + + + + +
+

신청서

+ 		+ + + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngReg.jsp index 658757d2..8371ad51 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngReg.jsp @@ -357,12 +357,12 @@ $("#needTxtbNum").focus(); return false; } - /*if($(".uploaded_obj").length == 0){ + if($(".uploaded_obj").length == 0){ alert("파일을 첨부해 주세요."); return false; } - if($("#agree1").length > 0 && !$('#agree1').prop('checked')){ + /* if($("#agree1").length > 0 && !$('#agree1').prop('checked')){ alert('개인정보 이용 약관에 동의해주세요.'); return false; } */ @@ -510,7 +510,8 @@ - + + @@ -783,7 +784,20 @@ - <%-- + + + + +
+

신청서

+
+
+ + + + + +

필수입력 항목*

첨부파일

@@ -861,7 +875,7 @@
- --%> + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp index 61054ced..6563f4db 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp @@ -716,6 +716,46 @@ + +
+
+

신청서

+
+
+
+ + + + + + + + + + + + + + + + + + +
신청서 (th 명)을 보여주는 표
+

신청서

+ 		+ + + +
+

신청서

+ 		+ + + +
+
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp index 185ca8cf..af3ef319 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp @@ -297,6 +297,35 @@ + +
+
+

신청서

+
+
+
+ + + + + + + + + + + + + + +
운영 계획 (th 명)을 입력하는 표
+

신청서

+ 		+ + + +
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp index 19ad6f89..cd10e1d9 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp @@ -391,6 +391,45 @@
+
+
+

신청서

+
+
+
+ + + + + + + + + + + + + + + + + + +
신청서 (th 명)을 보여주는 표
+

신청서

+ 		+ + + +
+

신청서

+ 		+ + + +
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp index 4003b2a1..ae17eaed 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp @@ -460,6 +460,12 @@ return flag = false; } + + if($(".uploaded_obj").length == 0){ + alert("신청서를 첨부해 주세요."); + return false; + } + if($("#agree1").length > 0 && !$('#agree1').prop('checked')){ alert('개인정보 이용 약관에 동의해주세요.'); return false; @@ -487,7 +493,6 @@ } function callDataSetting(data){ - fncReset('Y'); // 데이터 초기화 진행 var info = data.info; var fileList = data.fileList; @@ -585,7 +590,33 @@ $('duet-date-picker[name=oprtnEndDt]').val(dateFormat(info.oprtnEndDt.replace(/[.]/gi,''), 'date')) $('#oprtnEndDt').val(dateFormat(info.oprtnEndDt.replace(/[.]/gi,''), 'date')); } + + var fileTbody = $("#tbody_fiielist"); + $.each(fileList, function(idx, obj){ + var tr = $("").addClass('item_'+obj.atchFileId+'_'+obj.fileSn).addClass('uploaded_obj'); + var hiddenInput = $('').attr('type', 'hidden').attr('name', 'fileSize').addClass('item_file_size').val(obj.fileSize); + var td1 = $('').addClass('td_filename'); + var td2 = $('').addClass('td_filesort'); + var td3 = $('').addClass('td_filesize'); + var td4 = $(''); + var span1 = $('').addClass('file_name_text').text(obj.orignlFileNm); + var span2 = $('').addClass('file_filesort_text').attr('value', obj.fileExtsn).text(obj.fileExtsn); + var span3 = $('').addClass('file_size_text').attr('value', obj.fileMg).text(obj.fileMg); + var button = $('
+
+
+

신청서 제출

+ ※ 학교장 직인이 날인되지 않았을 경우, 인정되지 않음 +
+
+
+
+ +
+

필수입력 항목*

신청서 제출
+
+
+ + + +
+
+ + + + + + + + + + + + + + + + + +
첨부파일 파일명, 종류, 크기 정보 제공
파일 명종류크기
+

첨부하실 파일을 마우스끌어서 넣어주세요.

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
첨부파일 파일명, 종류, 크기, 삭제 정보 제공
파일 명종류크기삭제
+ ${fileList.orignlFileNm} + + "> + + "> + + +
+
+ +
+

개인정보 이용 동의

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp index 573cc2fd..f8666a90 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp @@ -480,6 +480,45 @@
+
+
+

신청서

+
+
+
+ + + + + + + + + + + + + + + + + + +
신청서 (th 명)을 보여주는 표
+

신청서

+ 		+ + + +
+

신청서

+ 		+ + + +
+
+

차시별 운영계획