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# - - A.GRD_STATUS = #searchGrdStatus# + + + 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) = '진행' + + + 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) = '대기' + + + 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) = '종료' + ORDER BY 1=1 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) {