From 63e3e3a20d3e3a995feae3ce7855b7496a69d2b9 Mon Sep 17 00:00:00 2001
From: wyh <mail>
Date: Fri, 13 Oct 2023 16:25:19 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A1=B0=EC=A0=95=EC=A2=85=EA=B2=B0=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D=20=EA=B2=80=EC=83=89=EC=A1=B0=EA=B1=B4=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../solr/search/impl/SearchServiceImpl.java   | 15 ++++-
 .../kccadr/adjclsmgr/adjCloseMangeList.jsp    | 57 ++++++++++++++++++-
 2 files changed, 69 insertions(+), 3 deletions(-)

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 @@
 		<c:forEach var="val" items="${commandMap.searchCondition2}">
 			fncCheckValue('searchCondition2', '${val}')
 		</c:forEach>
+			
+		var date = new Date();
+		var year = date.getFullYear();
+		
+		var startY = Number(year);
+		var endY = 2021;
+		for(var y = startY; y>= endY; y-- ){
+			$('#searchStartYear').append("<option value='"+y+"'>" + y+"년"+"</option>")
+			$('#searchEndYear').append("<option value='"+y+"'>" + y+"년"+"</option>")
+		}
+		
+		$('#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 = "<c:url value='/kccadr/adjclsmgr/adjCloseMangeList.do'/>";
         listForm.submit();
     }
@@ -96,6 +129,12 @@
 	<input type="hidden" name="adrSeq" value="" />
 	<input type="hidden" name="adrSn" value="" />
 	<input type="hidden" name="searchLoginId" value="<c:out value="${commandMap.searchLoginId}" />"  />
+	<input type="hidden" name="searchCcty" value="<c:out value="${commandMap.searchCcty}" />"  />
+	
+	<input type="hidden" name="searchStartYear" value="<c:out value="${commandMap.searchStartYear}" />"  />
+	<input type="hidden" name="searchEndYear" value="<c:out value="${commandMap.searchEndYear}" />"  />
+	
+	
 </form>
 <form:form id="form" name="form" commandName="adjClsMgrVO" onsubmit="return false;" method="post">
 <!-- cont -->
@@ -182,7 +221,20 @@
                                 	</c:forEach>
                                 </select>
                             </li>
-                            
+                            <li>
+                            	<p class="tit_text">신청내용</p>
+                            	<kc:select codeId="CC002" name="searchCcty" id="searchCcty" defaultText="전체" defaultValue="" selectedValue="${commandMap.searchCcty}" />
+                            </li>
+                            <li>
+                            	<p class="tit_text">접수년도</p>
+                            	<select name="searchStartYear" id="searchStartYear" title="선택">
+                            	<option value=''>전체</option>
+                                </select>
+                                ~
+                                <select name="searchEndYear" id="searchEndYear" title="선택">
+                                <option value=''>전체</option>
+                                </select>
+                            </li>
 						</ul>
                     </div>
                 </div>
@@ -232,7 +284,8 @@
 										<c:out value="${list.sbmtDe}" />
 									</p>
 								</td>
-								<td class="td_date"><c:choose>
+								<td class="td_date">
+									<c:choose>
 										<c:when test="${list.reqOlCd ne '2' }">
 											<a href="#none" onclick="fncGoDetail('${list.adrSeq}', '${list.adrSn}');">${empty list.adrNo ? '-' : list.adrNo}</a>
 										</c:when>