From 6a4e4c38e66b777a2a21d1e97dadbe2b17f53302 Mon Sep 17 00:00:00 2001
From: tolag3 <tolag3@gmail.com>
Date: Thu, 13 Jul 2023 16:40:44 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?=
 =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=EA=B3=A0?=
 =?UTF-8?q?=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

조정진행관리 > 조정위원관리 > 목록
1. 리스트의 조정부 항목을 조정위원이 속해있는 조정부에 '부'는 뺀 이름으로 변경
ex ) 합의5부 -> 합의5 / 단독11부 -> 단독11
2. 검색조건 추가 : 조정위원, 조정부, 위원임기, 기준일자 추가 임기의 경우 임기종료연도를 기준으로 검색
3. 첫 페이지 접근 시 검색 날짜 기준 위원임기 내에 있는 위원들만 출력
4. 검색조건에 기준일자는 오늘 날짜로 디폴트, 날짜 변경 가능하게 추가
5. 조정위원 마지막페이지의 테스트인원 삭제
     -> 개발자 테스트용 아이디로 미삭제하기로 함
---
 .../cclt/web/ConciliatorManageController.java | 22 ++++++++--------
 .../cclt/ConciliatorManage_SQL_Mysql.xml      |  4 +--
 .../adjPgrMgr/cclt/ConciliatorManageList.jsp  | 26 +++++++++----------
 3 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java b/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java
index 68a5ceb3..cb81b6b0 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java
@@ -96,6 +96,17 @@ public class ConciliatorManageController {
         	conciliatorManageVO.setSearchCondition2("2");
         }
 
+        if (StringUtil.isEmpty(conciliatorManageVO.getSearchStartDt())) { // 조회일시가 null인경우
+        	Date today = new Date();
+        	//조정진행목록 보이는 화면 수정 요청_230524
+        	int month = -1;
+        	if(StringUtil.isNotEmpty(conciliatorManageVO.getSearchMonth())) {
+        		month = -(Integer.valueOf(conciliatorManageVO.getSearchMonth()));
+        	}
+        	conciliatorManageVO.setSearchStartDt(DateFormatUtils.format(DateUtils.addMonths(today, month), "yyyyMMdd"));
+        	conciliatorManageVO.setSearchEndDt(DateFormatUtils.format(today, "yyyyMMdd"));
+        }
+        
         /** paging */
         PaginationInfo paginationInfo = new PaginationInfo();
         paginationInfo.setCurrentPageNo(conciliatorManageVO.getPageIndex());
@@ -115,17 +126,6 @@ public class ConciliatorManageController {
             conciliatorManageVO.setSearchKeyword(egovCryptoUtil.decrypt(conciliatorManageVO.getSearchKeyword()));
         }
         
-        if (StringUtil.isEmpty(conciliatorManageVO.getSearchStartDt())) { // 조회일시가 null인경우
-            Date today = new Date();
-            //조정진행목록 보이는 화면 수정 요청_230524
-            int month = -1;
-            if(StringUtil.isNotEmpty(conciliatorManageVO.getSearchMonth())) {
-            	month = -(Integer.valueOf(conciliatorManageVO.getSearchMonth()));
-            }
-            conciliatorManageVO.setSearchStartDt(DateFormatUtils.format(DateUtils.addMonths(today, month), "yyyyMMdd"));
-            conciliatorManageVO.setSearchEndDt(DateFormatUtils.format(today, "yyyyMMdd"));
-            
-        }
         
 
         return "kccadr/adjPgrMgr/cclt/ConciliatorManageList";
diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml
index bec7d5a7..4552d77e 100644
--- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml
@@ -92,10 +92,10 @@
 			</isEqual>
 		</isNotEmpty>
 		<isEqual prepend="AND" property="searchCondition2" compareValue="1">
-			
+			TO_CHAR(STR_TO_DATE(T1.MEM_TERM_EN, '%Y%m%d'),'YYYY') = #searchYear#
 		</isEqual>
 		<isEqual prepend="AND" property="searchCondition2" compareValue="2">
-			
+			#searchStartDt# BETWEEN TO_CHAR(STR_TO_DATE(T1.MEM_TERM_ST, '%Y%m%d'),'YYYY-MM-DD') AND TO_CHAR(STR_TO_DATE(T1.MEM_TERM_EN, '%Y%m%d'),'YYYY-MM-DD')
 		</isEqual>
 		ORDER BY 1=1
 		<isNotEmpty property="searchSortCnd">
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageList.jsp
index 3a59d218..c928b99a 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageList.jsp
@@ -36,7 +36,7 @@
 		
 		//해당 페이지에 대한 권한 체크
 		_admin_fn_check_authority("ConciliatorManageList", "div.cont", "ALL");
-		setSearchMonthDate(1);
+// 		setSearchMonthDate(1);
 		setSearchCondition(<c:out value="${conciliatorManageVO.searchCondition2}"/>);
 	});
 
@@ -165,28 +165,26 @@
 							</li>
 							<li>
 								<p class="tit_text">위원임기 검색</p>
-								<select name="searchCondition" id="searchCondition" onchange="setSearchCondition(this.value);">
-									<option value="" <c:if test="${empty conciliatorManageVO.searchCondition2}">selected="selected"</c:if>>전체</option>
+								<select name="searchCondition2" id="searchCondition2" onchange="setSearchCondition(this.value);">
+									<option value="0" <c:if test="${empty conciliatorManageVO.searchCondition2}">selected="selected"</c:if>>전체</option>
 									<option value="1" <c:if test="${conciliatorManageVO.searchCondition2 eq '1'}">selected="selected"</c:if>>위원임기</option>
 									<option value="2" <c:if test="${conciliatorManageVO.searchCondition2 eq '2'}">selected="selected"</c:if>>기준일자</option>
 								</select>
 								
 								<%-- 위원임기 --%>
 								<select name="searchYear" id="searchYear" class="search1">
-									<option value="2018" ${conciliatorManageVO.searchYear eq '2018' ? 'selected' : '' }>2018년</option>
-									<option value="2019" ${conciliatorManageVO.searchYear eq '2019' ? 'selected' : '' }>2019년</option>
-									<option value="2020" ${conciliatorManageVO.searchYear eq '2020' ? 'selected' : '' }>2020년</option>
-                                    <option value="2021" ${conciliatorManageVO.searchYear eq '2021' ? 'selected' : '' }>2021년</option>
-                                    <option value="2022" ${conciliatorManageVO.searchYear eq '2022' ? 'selected' : '' }>2022년</option>
-                                    <option value="2023" ${conciliatorManageVO.searchYear eq '2023' ? 'selected' : '' }>2023년</option>
-                                    <option value="2024" ${conciliatorManageVO.searchYear eq '2024' ? 'selected' : '' }>2024년</option>
-                                    <option value="2025" ${conciliatorManageVO.searchYear eq '2025' ? 'selected' : '' }>2025년</option>
-                                    <option value="2026" ${conciliatorManageVO.searchYear eq '2026' ? 'selected' : '' }>2026년</option>
-                                    <option value="2027" ${conciliatorManageVO.searchYear eq '2027' ? 'selected' : '' }>2027년</option>
+									<c:forEach var="year" begin="2010" end="2051">
+										<c:if test="${not empty conciliatorManageVO.searchYear}">
+											<option value="${year}" ${conciliatorManageVO.searchYear eq year ? 'selected' : '' }>${year}년</option>
+										</c:if>
+										<c:if test="${empty conciliatorManageVO.searchYear}">
+											<option value="${year}" ${year eq '2023' ? 'selected' : '' }>${year}년</option>
+										</c:if>
+									</c:forEach>
                                 </select>
                                 <%-- 기준일자 --%>
 								<div class="radio_wrap" id="searchYearMonthDay">
-									<div id="sel_date" class="sel_date">
+									<div id="sel_date" class="sel_date" style="margin: 0 0 0 0;">
 										<input type="text" class="startDate inp" title="검색시작일" id="startDate01" name="searchStartDt" value="${conciliatorManageVO.searchStartDt}" data-datecontrol="true">
 										<div class="calendar_in" id="calendarName_startDate" style="z-index: 9;">
 											<button type="button" value="달력 팝업 열기" onclick="return calendarOpen('startDate01-lry','',this)" class="btn_cal"></button>