From 3b8c2b947408558683358c4fd311fa0551d49297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?= Date: Wed, 7 Feb 2024 12:28:25 +0900 Subject: [PATCH 1/3] =?UTF-8?q?2024/02/07=20=EA=B4=80=EB=A6=AC=EC=9E=90?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp | 2 +- .../jsp/oprtn/fndthEnhanceTrn/eduInstrFeeMngList.jsp | 2 +- .../jsp/oprtn/tngrVisitEdu/popup/instrAplctPhotoPopup.jsp | 4 ++-- .../jsp/oprtn/tngrVisitEdu/popup/rsdncPopListPopup.jsp | 6 +++--- src/main/webapp/visitEdu/adm/publish/css/popup.css | 3 +++ 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp index cd39ef94..5bae0196 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp @@ -478,7 +478,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/eduInstrFeeMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/eduInstrFeeMngList.jsp index c0858b90..78d4e857 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/eduInstrFeeMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/eduInstrFeeMngList.jsp @@ -423,7 +423,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAplctPhotoPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAplctPhotoPopup.jsp index e2048345..66fec1c1 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAplctPhotoPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAplctPhotoPopup.jsp @@ -137,7 +137,7 @@ function fncPopClose(){
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/rsdncPopListPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/rsdncPopListPopup.jsp index 38186783..057b7e3f 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/rsdncPopListPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/rsdncPopListPopup.jsp @@ -105,7 +105,7 @@ $(document).ready(function(){ " /> " /> " /> -
+

지역선택

@@ -151,8 +151,8 @@ $(document).ready(function(){
- - + +
diff --git a/src/main/webapp/visitEdu/adm/publish/css/popup.css b/src/main/webapp/visitEdu/adm/publish/css/popup.css index 93a9c1d8..03997e68 100644 --- a/src/main/webapp/visitEdu/adm/publish/css/popup.css +++ b/src/main/webapp/visitEdu/adm/publish/css/popup.css @@ -184,6 +184,9 @@ .area_popup .cont_wrap .tit{position: relative; padding: 0 0 0 20px;} .area_popup .cont_wrap .tit::before{position: absolute; content: ""; width: 12px; height: 12px; border-radius: 50%; border: 3px solid #3a72db; left: 0; top: 57%; transform: translateY(-50%); box-sizing: border-box;} +/*지역선택 팝업 패딩값*/ +.ch_pop{padding: 30px;} + /* print */ @media print { table th {background-color: #e5e5e5 !importnat; -webkit-print-color-adjust: exact;} From 42a810f27f9ae1e8f74c67419967aed9530d3c21 Mon Sep 17 00:00:00 2001 From: kmg Date: Wed, 7 Feb 2024 14:04:36 +0900 Subject: [PATCH 2/3] =?UTF-8?q?2024/02/27=20=EC=9B=B9=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=84=B1=20:=20=ED=95=B4=EB=8B=B9=EC=82=AC=ED=95=AD=EC=97=86?= =?UTF-8?q?=EB=8A=94=20title=3D"=EC=83=88=EC=B0=BD=EC=97=B4=EB=A6=BC"=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index 52f00484..f53b81d1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -276,7 +276,7 @@ function usrJoin(){ - + @@ -284,12 +284,12 @@ function usrJoin(){ - + - +
@@ -341,16 +341,16 @@ function usrJoin(){ - + - + - + From 09f6f52d967889b8bd0c8683562928a8908519af Mon Sep 17 00:00:00 2001 From: jiwoo Date: Wed, 7 Feb 2024 17:51:17 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=B2=AD?= =?UTF-8?q?=EC=86=8C=EB=85=84=20=EB=A9=94=EC=9D=BC=20=ED=85=9C=ED=94=8C?= =?UTF-8?q?=EB=A6=BF=20=EC=88=98=EC=A0=95,=20=EA=B8=B0=EC=86=8C=EC=9C=A0?= =?UTF-8?q?=EC=98=88=20=EB=8C=80=EC=83=81=EC=9E=90=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=20=EC=A1=B0=EA=B1=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcc/ve/cmm/VeSendMail.java | 15 +++- .../trgtMng/web/CndtnTrgtMngController.java | 33 ++++----- .../jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp | 74 ++++++++----------- .../oprtn/tngrVisitEdu/eduAplctMngDetail.jsp | 2 +- .../jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp | 2 +- 5 files changed, 58 insertions(+), 68 deletions(-) diff --git a/src/main/java/kcc/ve/cmm/VeSendMail.java b/src/main/java/kcc/ve/cmm/VeSendMail.java index 74158a95..b046f4c1 100644 --- a/src/main/java/kcc/ve/cmm/VeSendMail.java +++ b/src/main/java/kcc/ve/cmm/VeSendMail.java @@ -153,7 +153,7 @@ public class VeSendMail { // fromAddr = "school@copyright.or.kr"; name= "여부복 주임";// 담당자명 phone="055-792-0224";// 폰번호 - email="yeo17@copyright.or.kr";// 메일 + email="school@copyright.or.kr";// 메일 }else if("Z".equals(sndFlag)) { // fromAddr = "school@copyright.or.kr"; message.setSubject("[한국저작권위원회] 찾아가는 저작권 교육관련 협조요청 사항"); @@ -259,7 +259,6 @@ public class VeSendMail { * AnotaionSchedule 211 라인 참조 * */ if("B".equals(sndFlag) // B -> 기소유예 - || "C".equals(sndFlag) // C -> 찾교청소년 || "G".equals(sndFlag) // G -> 체험교실 ) { @@ -273,6 +272,18 @@ public class VeSendMail { .replace("[[_Content_]]", Cn) ; Cn = emailContent; + }else if("C".equals(sndFlag)){ // C -> 찾교청소년 . 템플릿 변경 + + String emailContent = ""; + + emailContent = this.getTemplate() + .replace("[[_Name_]] 드림", "") + .replace("[[_Phone_]]", phone) + .replace("[[_Phone_tel_]]", phone) + .replace("[[_Email_]]", email) + .replace("[[_Content_]]", "안녕하세요, 한국저작권위원회 교육운영팀입니다.
"+Cn) + ; + Cn = emailContent; }else if("S".equals(sndFlag)){ // S -> 찾교성인 . 템플릿 변경 String emailContent = ""; diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index 7c262c27..91cb9146 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -351,34 +351,27 @@ public class CndtnTrgtMngController { //cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); } - //성명검색 - if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())){ - selectCondition += " AND a.trgt_nm = '" +egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()) + "' "; - //cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); + if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())) { + if("1".equals(cndtnTrgtInfoMngVO.getSrchCndt1())) { //전체 + selectCondition += " AND (a.trgt_nm = '" +egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()) + "' "+" OR a.prsctr_nm ='" +cndtnTrgtInfoMngVO.getSearchKeywordFrom() + "' "+" OR a.vnt_nmbr ='" +cndtnTrgtInfoMngVO.getSearchKeywordFrom() + "' "+" OR a.req_nmbr ='" +cndtnTrgtInfoMngVO.getSearchKeywordFrom() + "') "; + }else if("2".equals(cndtnTrgtInfoMngVO.getSrchCndt1())) { //성명 + selectCondition += " AND a.trgt_nm = '" +egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()) + "' "; + }else if("3".equals(cndtnTrgtInfoMngVO.getSrchCndt1())) { //검사명 + selectCondition += " AND a.prsctr_nm ='" +cndtnTrgtInfoMngVO.getSearchKeywordFrom() + "' "; + }else if("4".equals(cndtnTrgtInfoMngVO.getSrchCndt1())) { //사건번호 + selectCondition += " AND a.vnt_nmbr ='" +cndtnTrgtInfoMngVO.getSearchKeywordFrom() + "' "; + }else { //의뢰번호 + selectCondition += " AND a.req_nmbr ='" +cndtnTrgtInfoMngVO.getSearchKeywordFrom() + "' "; + } } + //생년월일검색 if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordTo())){ selectCondition += " AND a.d_birth ='" +cndtnTrgtInfoMngVO.getSearchKeywordTo() + "' "; } - //검사명검색 - if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchPrsctrNm())){ - selectCondition += " AND a.prsctr_nm ='" +cndtnTrgtInfoMngVO.getSearchPrsctrNm() + "' "; - - } - //사건번호검색 - if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchVntNmbr())){ - selectCondition += " AND a.vnt_nmbr ='" +cndtnTrgtInfoMngVO.getSearchVntNmbr() + "' "; - - } - //의뢰번호검색 - if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchReqNmbr())){ - selectCondition += " AND a.req_nmbr ='" +cndtnTrgtInfoMngVO.getSearchReqNmbr() + "' "; - - } - cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp index 75963a48..4d2a1b2c 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp @@ -316,6 +316,13 @@ form.target = "_duplChkPopup"; form.submit(); } + +/* function srchCndt2Chg(){ + alert("1234"); + $(".select2-results__option").each(function(index, item){ + alert("1234"); + }) + } */ 교육과정관리 @@ -369,45 +376,22 @@
- - - - - - -<%-- --%> -<%-- --%> -<%-- --%> - - - - -<%-- --%> - - - -<%-- --%> - - -<%-- --%> - - -

구분1

- + +
-
-

구분6

-
-
- -
@@ -417,12 +401,6 @@
-
-

구분7

-
-
- -
@@ -440,12 +418,6 @@
-
-

구분8

-
-
- -
@@ -464,13 +436,27 @@

관할청  

+ -
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp index 4a70e55b..e26291df 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp @@ -160,7 +160,7 @@ ); sendEmail( '', - "교육운영 관리 시스템입니다. 신청하신 찾아가는 청소년 교육이 확정되었습니다.", + "신청하신 찾아가는 청소년 교육이 확정되었습니다.", '', '', "C", diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp index c69986ad..8920a53c 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp @@ -341,7 +341,7 @@ ); sendEmail( $(this).data('email'), - "교육운영 관리 시스템입니다. \n" + $(this).data('chrgnm')+"님의 " + $(this).data('date') + " 교육 강의만족도 제출 바랍니다.", + $(this).data('chrgnm')+"님의 " + $(this).data('date') + " 교육 강의만족도 제출 바랍니다.", $(this).val().split('@')[0], $(this).data('userid'), "C",