diff --git a/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java b/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java
index 35a69eb4..b9497e75 100644
--- a/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java
+++ b/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java
@@ -350,6 +350,11 @@ public class SearchServiceImpl implements InitializingBean, SearchService {
String searchEachAdrAdminYn = (String)commandMap.get("searchEachAdrAdminYn");
String searchLoginId = (String)commandMap.get("searchLoginId");
+ String searchCcty = (String)commandMap.get("searchCcty"); // 신청내용
+ String searchStartYear = (String)commandMap.get("searchStartYear"); // 접수년도 시작연도
+ String searchEndYear = (String)commandMap.get("searchEndYear"); // 접수년도 종료연도
+
+
//검색조건 추가
if( !"*:*".equals(_q.toString()) && StringUtils.isEmpty(searchCondition)){
_q.insert(0, "*");
@@ -381,7 +386,15 @@ public class SearchServiceImpl implements InitializingBean, SearchService {
index++;
}
_q.append(")");
-
+ }
+
+ //신청내용 조건 추가
+ if(StringUtils.isNotEmpty(searchCcty)) {
+ query.addFilterQuery("ccTy:"+searchCcty);
+ }
+ // 접수년도 조건 추가
+ if(StringUtils.isNotEmpty(searchStartYear)&&StringUtils.isNotEmpty(searchEndYear)) {
+ query.addFilterQuery("frstRegistPnttm:"+searchStartYear+"* OR "+searchEndYear+"*");
}
//조정조사관 조회 구분 라디오 버튼 - 담당사건만 보기
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp
index d3e4d6af..02a5ac84 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp
@@ -22,6 +22,19 @@
신청내용 접수년도