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",