From 7a452902fc10f522f6101dc23b21ff1cabafd696 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Thu, 6 Jul 2023 16:26:08 +0900
Subject: [PATCH] =?UTF-8?q?=EB=93=B1=EA=B8=89=EC=A0=9C=20=EB=82=B4?=
 =?UTF-8?q?=EC=97=AD=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itn/let/sym/grd/service/MberGrdVO.java    | 13 ++++++++--
 .../sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml  |  9 ++++---
 .../WEB-INF/jsp/sym/grd/mberGrdList.jsp       | 25 ++++++++++++++++---
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/main/java/itn/let/sym/grd/service/MberGrdVO.java b/src/main/java/itn/let/sym/grd/service/MberGrdVO.java
index e069bdc8..4fa19779 100644
--- a/src/main/java/itn/let/sym/grd/service/MberGrdVO.java
+++ b/src/main/java/itn/let/sym/grd/service/MberGrdVO.java
@@ -5,7 +5,8 @@ import java.util.List;
 import itn.let.uss.umt.service.UserDefaultVO;
 
 public class MberGrdVO extends UserDefaultVO {
-
+	private static final long serialVersionUID = 1L;
+	
 	private int grdSetNo;				// 등급설정번호
 	private String grdSetNm;				// 등급설정명
 	private long stdAmt;					// 기준결제액
@@ -40,7 +41,9 @@ public class MberGrdVO extends UserDefaultVO {
 
 	private String grdNoti;		// 회원등급제 시행 여부
 	private String grdDate;		// 회원등급제 시행일자
-
+	
+	// 검색필터
+	private String searchGrdStatus;
 
 	public int getGrdSetNo() {
 		return grdSetNo;
@@ -230,4 +233,10 @@ public class MberGrdVO extends UserDefaultVO {
 	public void setGrdDate(String grdDate) {
 		this.grdDate = grdDate;
 	}	
+	public String getSearchGrdStatus() {
+		return searchGrdStatus;
+	}
+	public void setSearchGrdStatus(String searchGrdStatus) {
+		this.searchGrdStatus = searchGrdStatus;
+	}	
 }
diff --git a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml
index 64dcef9a..d8507540 100644
--- a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml
@@ -95,8 +95,8 @@
 			, A.AMT						AS amt
 			, A.TOT_AMT					AS totAmt
 			, DATE_FORMAT(A.GRD_DATE, '%Y-%m-%d')					AS grdDate
-			, DATE_FORMAT(A.GRD_START_DATE, '%Y-%m-%d %H:%i')		AS grdStartDate
-			, DATE_FORMAT(A.GRD_END_DATE, '%Y-%m-%d %H:%i')			AS grdEndDate
+			, DATE_FORMAT(A.GRD_START_DATE, '%Y-%m-%d')		AS grdStartDate
+			, DATE_FORMAT(A.GRD_END_DATE, '%Y-%m-%d')			AS grdEndDate
 			, A.GRD_STATUS				AS grdStatus
 			, CASE
 				WHEN A.GRD_STATUS = 'Y'
@@ -126,7 +126,10 @@
                 <isEqual prepend="AND" property="searchCondition" compareValue="1">
 				 	A.MBER_ID = #searchKeyword#
                 </isEqual>
-            </isNotEmpty>			
+            </isNotEmpty>		
+     	    <isNotEmpty prepend="AND" property="searchGrdStatus">
+  				A.GRD_STATUS = #searchGrdStatus#
+  			</isNotEmpty>	                    	
 		ORDER BY 1=1
 		<isNotEmpty property="searchSortCnd">
 			,$searchSortCnd$
diff --git a/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp b/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp
index 1f296cb2..7d2a7a25 100644
--- a/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp
@@ -24,6 +24,13 @@
 <meta http-equiv="Content-Language" content="ko">
 <title>등급제 내역</title>
 <script type="text/javaScript" language="javascript" defer="defer">
+$( document ).ready(function(){
+	// change 함수
+	$("#searchGrdStatus").change(function(e){
+	   	linkPage(1); 
+	});
+});
+
 
 function fn_search(){
 	linkPage(1);
@@ -62,16 +69,26 @@ function fnSelectMber(mberId) {
 		<div class="pageCont">
 			<div class="listSerch">
 			
+				<select id="searchGrdStatus" name="searchGrdStatus" title="상태">
+					<option value="" <c:if test="${empty searchVO.searchGrdStatus }">selected="selected"</c:if> >상태</option>
+                    <option value="Y" <c:if test="${searchVO.searchGrdStatus == 'Y'}">selected="selected"</c:if> >진행중</option>
+                    <option value="N" <c:if test="${searchVO.searchGrdStatus == 'N'}">selected="selected"</c:if> >미진행</option>
+					<option value="E" <c:if test="${searchVO.searchGrdStatus == 'E'}">selected="selected"</c:if> >종료</option>
+	            </select>	            
+	            			
 				<select id="searchCondition" name="searchCondition">
-				<option value="" <c:if test="${empty searchVO.searchCondition}">selected="selected"</c:if>>전체</option>
-				<option value="1" <c:if test="${searchVO.searchCondition == '1'}">selected="selected"</c:if>>아이디</option>
+					<option value="" <c:if test="${empty searchVO.searchCondition}">selected="selected"</c:if>>전체</option>
+					<option value="1" <c:if test="${searchVO.searchCondition == '1'}">selected="selected"</c:if>>아이디</option>
 				</select>
 				
 				<input id="searchKeyword" name="searchKeyword" class="recentSearch" type="text" value="<c:out value='${searchVO.searchKeyword}'/>" size="25" title="검색" maxlength="100" />
 				<input type="button" class="btnType1" value="검색" onclick="fn_search(); return false;">				
 			</div>
 			<div class="listTop">
-				<p class="tType5">총 <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${paginationInfo.totalRecordCount}" pattern="#,###" /></span>건</p>
+				<p class="tType5">
+					총 <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${paginationInfo.totalRecordCount}" pattern="#,###" /></span>건
+					&nbsp;&nbsp;&nbsp; * 누적결제액은 문자할인이벤트 대상 결제금액을 제외한 합계금액입니다.
+				</p>
 				<div class="rightWrap">
 					<!-- <input type="button" class="printBtn" > -->
 					<select name="pageUnit" id="pageUnit" class="select" title="검색조건선택" onchange="linkPage(1);">
@@ -102,7 +119,7 @@ function fnSelectMber(mberId) {
 							<th>이름<input type="button" class="sortBtn sort" id="sort_mberNm"></th>
 							<th>등급<input type="button" class="sortBtn sort" id="sort_grdSetNo"></th>
 							<th>누적결제액<input type="button" class="sortBtn sort" id="sort_totAmt"></th>
-							<th>시행일<input type="button" class="sortBtn sort" id="sort_grdDate"></th>
+							<th>등급제 시행일<input type="button" class="sortBtn sort" id="sort_grdDate"></th>
 							<th>시작일<input type="button" class="sortBtn sort" id="sort_grdStartDate"></th>
 							<th>종료일 <input type="button" class="sortBtn sort" id="sort_grdEndDate"></th>
 							<th>등록일 <input type="button" class="sortBtn sort" id="sort_regDate"></th>