From 6076cc3e3dd543750034160313f460a2665a1199 Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Wed, 11 Sep 2024 12:27:47 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=9D=BC/?=
 =?UTF-8?q?=EC=9B=94=EB=B3=84=20=EB=A7=A4=EC=B6=9C=EC=95=A1=20=EC=97=91?=
 =?UTF-8?q?=EC=85=80=20=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20=EC=8B=9C=20?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EA=B2=B0=EC=A0=9C=EC=9D=BC=20?=
 =?UTF-8?q?=EC=A0=95=EB=A0=AC=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=ED=99=94=EB=A9=B4=201/3/6?=
 =?UTF-8?q?=EA=B0=9C=EC=9B=94=20=EA=B2=80=EC=83=89=20=ED=9B=84=20=EA=B0=9C?=
 =?UTF-8?q?=EC=9B=94=20=EC=84=A0=ED=83=9D=EA=B0=92=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=ED=99=94=20=ED=98=84=EC=83=81=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/itn/let/mjo/pay/service/MjonPayVO.java |  9 +++++++++
 .../java/itn/let/mjo/pay/web/MjonPayController.java  |  6 +++++-
 .../webapp/WEB-INF/jsp/uss/ion/pay/PayDayChart.jsp   | 12 +++++++-----
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java b/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java
index e61daec4..63d0296c 100644
--- a/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java
+++ b/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java
@@ -68,6 +68,7 @@ public class MjonPayVO extends ComDefaultVO{
 	private String recvUserId; // 받는 사용자 아이디
 	private String admUserId; // 관리자 아이디
 	private String blineCode;
+	private String monthTerm;	//검색 개월 1/3/6개월
 	
 	
 	public String getBlineCode() {
@@ -1735,6 +1736,14 @@ public class MjonPayVO extends ComDefaultVO{
 	public void setAmtAfterPayCnt(String amtAfterPayCnt) {
 		this.amtAfterPayCnt = amtAfterPayCnt;
 	}
+
+	public String getMonthTerm() {
+		return monthTerm;
+	}
+
+	public void setMonthTerm(String monthTerm) {
+		this.monthTerm = monthTerm;
+	}
 	
 	
 }
diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
index e753ea0d..0a6d84c5 100644
--- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
+++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
@@ -5416,6 +5416,8 @@ public class MjonPayController {
   			HttpServletResponse response , 
   			ModelMap model) throws Exception {
   		
+  		mjonPayVO.setSearchSortCnd("regDate");
+		mjonPayVO.setSearchSortOrd("asc");
   		mjonPayVO.setRecordCountPerPage(mjonPayVO.getPageUnit());
   		mjonPayVO.setFirstIndex(0);
   		LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
@@ -5704,7 +5706,9 @@ public class MjonPayController {
   			HttpServletResponse response , 
   			ModelMap model) throws Exception {
   		
-  		mjonPayVO.setRecordCountPerPage(mjonPayVO.getPageUnit());
+  		mjonPayVO.setSearchSortCnd("regDate");
+		mjonPayVO.setSearchSortOrd("asc");
+  		mjonPayVO.setRecordCountPerPage(20);
   		mjonPayVO.setFirstIndex(0);
   		LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
 		if(null != loginVO && !"super".equals(loginVO.getSiteId())){
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayDayChart.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayDayChart.jsp
index 73e41db8..cde0cf56 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayDayChart.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayDayChart.jsp
@@ -180,11 +180,11 @@ function payDayExcelDownload(){
 		
 		<div class="pageCont">
 			<div class="listSerch">
-				<select name="setCalMonth" onchange="fnSetCalMonth(this.value)">
-					<option value="0">전체</option>
-					<option value="1" selected="selected">1개월</option>
-					<option value="3">3개월</option>
-					<option value="6">6개월</option>
+				<select id="monthTerm" name="monthTerm" onchange="fnSetCalMonth(this.value)">
+					<option value="0" <c:if test="${searchVO.monthTerm eq '0'}">selected</c:if> >전체</option>
+					<option value="1" <c:if test="${searchVO.monthTerm eq '1'}">selected</c:if> >1개월</option>
+					<option value="3" <c:if test="${searchVO.monthTerm eq '3'}">selected</c:if> >3개월</option>
+					<option value="6" <c:if test="${searchVO.monthTerm eq '6'}">selected</c:if> >6개월</option>
 				</select>
 				<input type="hidden" name="cal_url" id="cal_url" value="/sym/cmm/EgovNormalCalPopup.do">
 			    <a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceBgndeYYYMMDD);">
@@ -385,6 +385,8 @@ function payDayExcelDownload(){
 <form id="payExcelDwnForm" name="payExcelDwnForm" method="post">
 	<input type="hidden" name="ntceBgnde" id="excelNtceBgnde"  value="<c:out value="${searchVO.ntceBgnde}" />">
 	<input type="hidden" name="ntceEndde" id="excelNtceEndde"  value="<c:out value="${searchVO.ntceEndde}" />">
+	<input type="hidden" name="pageUnit" id="excelPageUnit"  value="<c:out value="${paginationInfo.totalRecordCount}" />"><!-- 엑셀의 총 건수로 넘겨줌 -->
+	
 </form>
 
 </body>