tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'JIWOO' into advc

Browse Source
This commit is contained in:
jiwoo 2024-02-07 17:52:38 +09:00
commit c67a1fb592
5 changed files with 58 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/kcc/ve/cmm/VeSendMail.java
View File

@ -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_]]", "안녕하세요, 한국저작권위원회 교육운영팀입니다.<br>"+Cn)
;
Cn = emailContent;
}else if("S".equals(sndFlag)){ // S -> 찾교성인 . 템플릿 변경
String emailContent = "";

31
src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java
View File

@ -351,11 +351,20 @@ public class CndtnTrgtMngController {
//cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
}
//성명검색
if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())){
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()) + "' ";
//cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
}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())){
@ -363,22 +372,6 @@ public class CndtnTrgtMngController {
}
//검사명검색
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);

74
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp
View File

@ -316,6 +316,13 @@
form.target = "_duplChkPopup";
form.submit();
}
/* function srchCndt2Chg(){
alert("1234");
$(".select2-results__option").each(function(index, item){
alert("1234");
})
} */
</script>
<title>교육과정관리</title>
</head>
@ -369,45 +376,22 @@
<div class="list_top">
<!-- <div class="list_top_1"> -->
<!-- <div class="util_left"> -->
<!-- <p>구분1</p> -->
<!-- </div> -->
<!-- <div class="util_right"> -->
<!-- <select name="searchStatus" id="searchStatus" class="sel_type1"> -->
<%-- <option value="trgt_nm" <c:if test="${cndtnTrgtInfoMngVO.searchStatus == 'trgt_nm' }">selected="selected"</c:if>>이름</option> --%>
<%-- <option value="d_birth" <c:if test="${cndtnTrgtInfoMngVO.searchStatus == 'd_birth' }">selected="selected"</c:if>>생년월일</option> --%>
<%-- <option value="frstRegistPnttm" <c:if test="${cndtnTrgtInfoMngVO.searchStatus == 'frstRegistPnttm' }">selected="selected"</c:if>>의뢰일자</option> --%>
<!-- </select> -->
<!-- <div id="calendar"> -->
<!-- <div class="calendar_wrap"> -->
<%-- <input type="text" class="calendar" placeholder="시작일" title="시작일 선택" id="searchSmbtStartDt" name="searchSmbtStartDt" value="${cndtnTrgtInfoMngVO.searchSmbtStartDt}"> --%>
<!-- </div> -->
<!-- ~ -->
<!-- <div class="calendar_wrap"> -->
<%-- <input type="text" class="calendar" placeholder="종료일" title="종료일 선택" id="searchSmbtEndDt" name="searchSmbtEndDt" value="${cndtnTrgtInfoMngVO.searchSmbtEndDt}"> --%>
<!-- </div> -->
<!-- </div> -->
<%-- <input type="text" id="searchKeyword" name="searchKeyword" placeholder="이름을 입력해주세요." title="검색어 입력" class="search_input" value="<c:out value='${cndtnTrgtInfoMngVO.searchKeyword}'/>"> --%>
<!-- </div> -->
<!-- </div> -->
<div class="list_top_1">
<div class="util_left">
<p>구분1</p>
</div>
<div class="util_right">
<input type="text" id="searchKeywordFrom" name="searchKeywordFrom" placeholder="이름을 입력해주세요." title="검색어 입력" class="search_input" value="<c:out value='${cndtnTrgtInfoMngVO.searchKeywordFrom}'/>">
<select name="srchCndt1" id="srchCndt1" title="검색조건" class="sel_type1" >
<option value='1' <c:if test="${cndtnTrgtInfoMngVO.srchCndt1 == '1'}">selected="selected"</c:if>>전체</option>
<option value='2' <c:if test="${cndtnTrgtInfoMngVO.srchCndt1 == '2'}">selected="selected"</c:if>>대상자</option>
<option value='3' <c:if test="${cndtnTrgtInfoMngVO.srchCndt1 == '3'}">selected="selected"</c:if>>검사</option>
<option value='4' <c:if test="${cndtnTrgtInfoMngVO.srchCndt1 == '4'}">selected="selected"</c:if>>사건번호</option>
<option value='5' <c:if test="${cndtnTrgtInfoMngVO.srchCndt1 == '5'}">selected="selected"</c:if>>의뢰번호</option>
</select>
<input type="text" id="searchKeywordFrom" name="searchKeywordFrom" title="검색어 입력" class="search_input" value="<c:out value='${cndtnTrgtInfoMngVO.searchKeywordFrom}'/>">
<button type="button" class="btn_type08" onclick="fncGoList(); return false;">검색</button>
<button class="btn_type03" onclick="fncReset(this); return false;">초기화</button>
</div>
<div class="util_left">
<p>구분6</p>
</div>
<div class="util_right">
<input type="text" id="searchPrsctrNm" name="searchPrsctrNm" placeholder="검사명을 입력해주세요." title="검색어 입력" class="search_input" value="<c:out value='${cndtnTrgtInfoMngVO.searchPrsctrNm}'/>">
</div>
</div>
<div class="list_top_1">
@ -417,12 +401,6 @@
<div class="util_right">
<input type="text" id="searchKeywordTo" name="searchKeywordTo" placeholder="생년월일을 입력해 주세요.19800102" title="검색어 입력" class="search_input" value="<c:out value='${cndtnTrgtInfoMngVO.searchKeywordTo}'/>">
</div>
<div class="util_left">
<p>구분7</p>
</div>
<div class="util_right">
<input type="text" id="searchVntNmbr" name="searchVntNmbr" placeholder="사건번호를 입력해주세요." title="검색어 입력" class="search_input" value="<c:out value='${cndtnTrgtInfoMngVO.searchVntNmbr}'/>">
</div>
</div>
<div class="list_top_1">
@ -440,12 +418,6 @@
</div>
</div>
</div>
<div class="util_left">
<p>구분8</p>
</div>
<div class="util_right">
<input type="text" id="searchReqNmbr" name="searchReqNmbr" placeholder="의뢰번호를 입력해주세요." title="검색어 입력" class="search_input" value="<c:out value='${cndtnTrgtInfoMngVO.searchReqNmbr}'/>">
</div>
</div>
<div class="list_top_2">
<div class="util_left">
@ -464,13 +436,27 @@
</div>
<div class="util_right">
<p>관할청&nbsp;&nbsp;</p>
<!-- <select name="srchCndt2" id="srchCndt2" class="sel_type1" onchange="srchCndt2Chg();">
<option value="">지역</option>
<option value="광주">광주</option>
<option value="대구">대구</option>
<option value="대전">부산</option>
<option value="서울">수원</option>
<option value="울산">울산</option>
<option value="의정">의정부</option>
<option value="인천">인천</option>
<option value="전주">전주</option>
<option value="제주">제주</option>
<option value="창원">창원</option>
<option value="청주">청주</option>
<option value="춘천">춘천</option>
</select> -->
<select name="searchSelStatusTemp" id="searchSelStatusTemp" class="sel_type1" multiple="multiple" style="width: 75%">
<c:forEach var="list" items="${CmmnDetailCodeList}" varStatus="status">
<option value="${list.code }" <c:if test="${info.cmptntAthrt==list.code }">selected="selected"</c:if> >${list.codeNm }</option>
</c:forEach>
</select>
<!-- <button type="button" class="btn_type08" onclick="fncGoList(); return false;">검색</button> -->
</div>
</div>
<div class="list_top_2">

2
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp
View File

@ -160,7 +160,7 @@
);
sendEmail(
'<c:out value="${info.email}" />',
"교육운영 관리 시스템입니다. 신청하신 찾아가는 청소년 교육이 확정되었습니다.",
"신청하신 찾아가는 청소년 교육이 확정되었습니다.",
'<c:out value="${info.eduAplctOrd}" />',
'<c:out value="${info.userId}" />',
"C",

2
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp
View File

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