From 6e1b08662aa844ef81d0c6b20a7a1b9219338316 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 9 Jan 2024 18:09:54 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EA=B8=B0=EC=86=8C=EC=9C=A0=EC=98=88=20?= =?UTF-8?q?=EB=8C=80=EC=83=81=EC=9E=90=20=EA=B4=80=EB=A6=AC=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=20=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80,=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EA=B8=B0=EC=86=8C=EC=9C=A0?= =?UTF-8?q?=EC=98=88=20=EA=B5=90=EC=9C=A1=EC=86=8C=EA=B0=9C=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EA=B5=90=EC=9C=A1=EC=8B=A0=EC=B2=AD=20?= =?UTF-8?q?=EB=A7=81=ED=81=AC=20=EB=B3=80=EA=B2=BD=20=EB=93=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcc/com/cmm/ComDefaultVO.java | 29 +++++++++++++++++++ .../trgtMng/web/CndtnTrgtMngController.java | 22 ++++++++++++-- .../jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp | 23 ++++++++++++--- .../web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp | 6 ++-- .../jsp/web/ve/aplct/sspnIdtmt/eduInfo.jsp | 2 +- 5 files changed, 71 insertions(+), 11 deletions(-) diff --git a/src/main/java/kcc/com/cmm/ComDefaultVO.java b/src/main/java/kcc/com/cmm/ComDefaultVO.java index d534abd1..bd4e8a43 100644 --- a/src/main/java/kcc/com/cmm/ComDefaultVO.java +++ b/src/main/java/kcc/com/cmm/ComDefaultVO.java @@ -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; + } + } 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 fe79065e..86a770ed 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 @@ -299,22 +299,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); 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 6a01df7a..84236ca2 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp @@ -322,6 +322,12 @@ +
+

구분6

+
+
+ +
@@ -330,9 +336,12 @@
- - - +
+
+

구분7

+
+
+
@@ -351,6 +360,12 @@ +
+

구분8

+
+
+ +
@@ -375,7 +390,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp index 45eed905..c1c9817e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp @@ -249,10 +249,10 @@
-

찾아가는 저작권 교육

+

기소유예

- ‘찾아가는 저작권 교육’은 저작권 교육이 필요한 공공기관, 대학, 문화예술단체 등을 대상으로 무료로 강의를 지원하는 맞춤형 교육 서비스입니다. -

담당자 연락처) 02-2669-0083

+ 저작권 침해사범 중 검찰청으로부터 교육조건부 기소유예 처분을 받아 교육 의뢰된 자 +

문의사항 : 상단 교육문의 활용
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduInfo.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduInfo.jsp index 0f452900..9c0cb412 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduInfo.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduInfo.jsp @@ -88,7 +88,7 @@
- +