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 @@ fncCheckValue('searchCondition2', '${val}') + + var date = new Date(); + var year = date.getFullYear(); + + var startY = Number(year); + var endY = 2021; + for(var y = startY; y>= endY; y-- ){ + $('#searchStartYear').append("") + $('#searchEndYear').append("") + } + + $('#searchStartYear').find('option[value="${commandMap.searchStartYear}"]').attr("selected",true); + $('#searchEndYear').find('option[value="${commandMap.searchEndYear}"]').attr("selected",true); }); //권한 체크 결과값으로 후속처리 @@ -34,6 +47,22 @@ } function linkPage(pageNo){ + + if(form.searchStartYear.value != ""){ + if(form.searchEndYear.value == ""){ + alert("접수년도를 확인해 주세요"); + return false; + }else if(form.searchStartYear.value > form.searchEndYear.value){ + alert("검색 종료년도를 확인해 주세요"); + return false; + } + } else if(form.searchEndYear.value != ""){ + if(form.searchStartYear.value == ""){ + alert("접수년도를 확인해 주세요"); + return false; + } + } + var listForm = document.listForm ; listForm.pageIndex.value = pageNo ; var q1 = form.q1.value; @@ -42,6 +71,10 @@ listForm.searchCondition.value = form.searchCondition.value; listForm.searchCondition2.value = getCheckboxValue(); listForm.searchLoginId.value = form.searchLoginId.value; + + listForm.searchStartYear.value = form.searchStartYear.value; + listForm.searchEndYear.value = form.searchEndYear.value; + listForm.action = ""; listForm.submit(); } @@ -96,6 +129,12 @@ " /> + " /> + + " /> + " /> + + @@ -182,7 +221,20 @@ - +
  • +

    신청내용

    + +
  • +
  • +

    접수년도

    + + ~ + +
  • @@ -232,7 +284,8 @@

    - + + ${empty list.adrNo ? '-' : list.adrNo}