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-01-09 18:11:22 +09:00
commit 49a5efadca
5 changed files with 71 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/kcc/com/cmm/ComDefaultVO.java
View File

@ -202,6 +202,11 @@ public class ComDefaultVO implements Serializable {
private String srchCndt5 = "";
private String srchKwd5_1 = "";
private String srchKwd5_2 = "";
private String searchPrsctrNm; //검사명 검색
private String searchVntNmbr; //사건번호 검색
private String searchReqNmbr; //의뢰번호 검색
public int getBeSort() {
@ -1036,4 +1041,28 @@ public class ComDefaultVO implements Serializable {
this.srchKwd5_2 = srchKwd5_2;
}
public String getSearchPrsctrNm() {
return searchPrsctrNm;
}
public void setSearchPrsctrNm(String searchPrsctrNm) {
this.searchPrsctrNm = searchPrsctrNm;
}
public String getSearchVntNmbr() {
return searchVntNmbr;
}
public void setSearchVntNmbr(String searchVntNmbr) {
this.searchVntNmbr = searchVntNmbr;
}
public String getSearchReqNmbr() {
return searchReqNmbr;
}
public void setSearchReqNmbr(String searchReqNmbr) {
this.searchReqNmbr = searchReqNmbr;
}
}

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

@ -302,22 +302,38 @@ public class CndtnTrgtMngController {
if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeyword())){
String searchStatus = cndtnTrgtInfoMngVO.getSearchStatus();
// selectCondition = "AND a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')";
selectCondition = "AND a."+searchStatus+" LIKE '%" +cndtnTrgtInfoMngVO.getSearchKeyword() + "%'";
selectCondition += "AND a."+searchStatus+" LIKE '%" +cndtnTrgtInfoMngVO.getSearchKeyword() + "%'";
//cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
}
//성명검색
if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())){
selectCondition = " AND a.trgt_nm = '" +cndtnTrgtInfoMngVO.getSearchKeywordFrom() + "' ";
selectCondition += " AND a.trgt_nm = '" +cndtnTrgtInfoMngVO.getSearchKeywordFrom() + "' ";
//cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
}
//생년월일검색
if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordTo())){
selectCondition = " AND a.d_birth ='" +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);

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

@ -322,6 +322,12 @@
<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">
@ -330,9 +336,12 @@
</div>
<div class="util_right">
<input type="text" id="searchKeywordTo" name="searchKeywordTo" placeholder="생년월일을 입력해 주세요.19800102" title="검색어 입력" class="search_input" value="<c:out value='${cndtnTrgtInfoMngVO.searchKeywordTo}'/>">
<!-- <button class="btn_type03" onclick="fncReset(this); return false;">초기화</button> -->
</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>
@ -351,6 +360,12 @@
</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">
@ -375,7 +390,7 @@
<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>
<!-- <button type="button" class="btn_type08" onclick="fncGoList(); return false;">검색</button> -->
</div>
</div>
<div class="list_top_2">

6
src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp
View File

@ -249,10 +249,10 @@
<div class="tit_box">
<i class="tit_box_icon1"></i>
<div>
<p>찾아가는 저작권 교육</p>
<p>기소유예</p>
<span>
‘찾아가는 저작권 교육’은 저작권 교육이 필요한 <span>공공기관, 대학, 문화예술단체 등을 </span>대상으로 무료로 강의를 지원하는 맞춤형 교육 서비스입니다.
<p style="font-weight:400;color:red;font-size:17px;padding-top:10px;">담당자 연락처) 02-2669-0083</p>
저작권 침해사범 중 검찰청으로부터 교육조건부 기소유예 처분을 받아 교육 의뢰된 자
<a href="${pageContext.request.contextPath}/web/ve/aplct/sspnIdtmt/eduFAQList.do"><p style="font-weight:400;color:red;font-size:17px;padding-top:10px;">문의사항 : 상단 교육문의 활용</p></a>
</span>
</div>
</div>

2
src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduInfo.jsp
View File

@ -88,7 +88,7 @@
<div class="btn_left">
</div>
<div class="btn_center">
<button type="button" class="btnType08" onclick="location.href='<c:url value="/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.do" />'">교육신청</button>
<button type="button" class="btnType08" onclick="location.href='<c:url value="/web/ve/aplct/sspnIdtmt/eduAplctList.do" />'">교육신청</button>
</div>
<div class="btn_right">
</div>