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 @@
-
+ TO_CHAR(STR_TO_DATE(T1.MEM_TERM_EN, '%Y%m%d'),'YYYY') = #searchYear#
-
+ #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')
ORDER BY 1=1
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();
});
@@ -165,28 +165,26 @@
위원임기 검색
-