From 9f0b88feec84680c44ceddb1c4d190300c3b2873 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Thu, 13 Jul 2023 12:37:00 +0900
Subject: [PATCH] =?UTF-8?q?=EB=93=B1=EA=B8=89=EC=A0=9C=EB=82=B4=EC=97=AD?=
 =?UTF-8?q?=20=EC=83=81=ED=83=9C=EA=B0=92=20=EC=A1=B0=ED=9A=8C=20=EC=BF=BC?=
 =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml  | 42 ++++++++++++++++++-
 .../WEB-INF/jsp/sym/grd/mberGrdList.jsp       |  4 +-
 2 files changed, 42 insertions(+), 4 deletions(-)

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 3f2a7c28..5c05591f 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
@@ -140,8 +140,46 @@
 				 	A.MBER_ID = #searchKeyword#
                 </isEqual>
             </isNotEmpty>		
-     	    <isNotEmpty prepend="AND" property="searchGrdStatus">
-  				A.GRD_STATUS = #searchGrdStatus#
+     	    <isNotEmpty property="searchGrdStatus">
+                <isEqual property="searchGrdStatus" compareValue="Y">
+					AND (CASE
+						WHEN E.EVENT_STATUS = 'Y' AND DATE_FORMAT(NOW(), '%Y-%m-%d') BETWEEN DATE_FORMAT(E.EVENT_START_DATE, '%Y-%m-%d') AND DATE_FORMAT(E.EVENT_END_DATE, '%Y-%m-%d')
+						THEN '대기'			
+						WHEN A.GRD_STATUS = 'Y' AND NOW() BETWEEN A.GRD_START_DATE AND A.GRD_END_DATE
+						THEN '진행'
+						WHEN A.GRD_STATUS = 'N'
+						THEN '대기'
+						WHEN A.GRD_STATUS = 'E'
+						THEN '종료'
+						ELSE '종료'
+					END) = '진행'
+                </isEqual>     	    
+                <isEqual property="searchGrdStatus" compareValue="N">
+					AND (CASE
+						WHEN E.EVENT_STATUS = 'Y' AND DATE_FORMAT(NOW(), '%Y-%m-%d') BETWEEN DATE_FORMAT(E.EVENT_START_DATE, '%Y-%m-%d') AND DATE_FORMAT(E.EVENT_END_DATE, '%Y-%m-%d')
+						THEN '대기'			
+						WHEN A.GRD_STATUS = 'Y' AND NOW() BETWEEN A.GRD_START_DATE AND A.GRD_END_DATE
+						THEN '진행'
+						WHEN A.GRD_STATUS = 'N'
+						THEN '대기'
+						WHEN A.GRD_STATUS = 'E'
+						THEN '종료'
+						ELSE '종료'
+					END) = '대기'
+                </isEqual>     	    
+                <isEqual property="searchGrdStatus" compareValue="E">
+					AND (CASE
+						WHEN E.EVENT_STATUS = 'Y' AND DATE_FORMAT(NOW(), '%Y-%m-%d') BETWEEN DATE_FORMAT(E.EVENT_START_DATE, '%Y-%m-%d') AND DATE_FORMAT(E.EVENT_END_DATE, '%Y-%m-%d')
+						THEN '대기'			
+						WHEN A.GRD_STATUS = 'Y' AND NOW() BETWEEN A.GRD_START_DATE AND A.GRD_END_DATE
+						THEN '진행'
+						WHEN A.GRD_STATUS = 'N'
+						THEN '대기'
+						WHEN A.GRD_STATUS = 'E'
+						THEN '종료'
+						ELSE '종료'
+					END) = '종료'
+                </isEqual>     	                    
   			</isNotEmpty>	                    	
 		ORDER BY 1=1
 		<isNotEmpty property="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 33b6408e..a21b3402 100644
--- a/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp
@@ -101,8 +101,8 @@ function getMberGrdChk(mberId) {
 			
 				<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="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>