From dd44ad160b59fe7dfd2f63f4a0ab5ed76c2544ab Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Tue, 11 Jul 2023 12:36:20 +0900
Subject: [PATCH] =?UTF-8?q?=EB=93=B1=EA=B8=89=EC=A0=9C=20=EC=8B=9C?=
 =?UTF-8?q?=ED=96=89=EC=97=AC=EB=B6=80=20=EB=A1=9C=EC=A7=81=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/sym/grd/service/MberGrdVO.java  | 11 +++++++++--
 .../let/sym/grd/service/impl/MberGrdServiceImpl.java  |  6 +++---
 .../sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml          | 11 ++++++++++-
 3 files changed, 22 insertions(+), 6 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 4fa19779..8f577878 100644
--- a/src/main/java/itn/let/sym/grd/service/MberGrdVO.java
+++ b/src/main/java/itn/let/sym/grd/service/MberGrdVO.java
@@ -39,8 +39,9 @@ public class MberGrdVO extends UserDefaultVO {
 	private String grdStatusNm;
 	private int mberGrdHistNo;
 
-	private String grdNoti;		// 회원등급제 시행 여부
-	private String grdDate;		// 회원등급제 시행일자
+	private String grdNoti;			// 회원등급제 시행 여부
+	private String grdDate;			// 회원등급제 시행일자
+	private String grdDatePrgYn;	// 회원등급제 시행일자 진행여부(오늘보다 이전날짜이면 Y, 이후이면 N)
 	
 	// 검색필터
 	private String searchGrdStatus;
@@ -233,6 +234,12 @@ public class MberGrdVO extends UserDefaultVO {
 	public void setGrdDate(String grdDate) {
 		this.grdDate = grdDate;
 	}	
+	public String getGrdDatePrgYn() {
+		return grdDatePrgYn;
+	}
+	public void setGrdDatePrgYn(String grdDatePrgYn) {
+		this.grdDatePrgYn = grdDatePrgYn;
+	}	
 	public String getSearchGrdStatus() {
 		return searchGrdStatus;
 	}
diff --git a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java
index cec6f5fd..753de5f1 100644
--- a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java
+++ b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java
@@ -121,7 +121,7 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG
 		// Step 1. 등급제 시행 ON 일경우
 		MberGrdVO mberGrdVO1 = new MberGrdVO();
 		mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
-		if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate()) {
+		if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
 			// 문자할인, B선라인 대상자 초기화
 			updateCnt1 = updateMberGrdEndBySale(mberGrdVO);
 			
@@ -155,10 +155,10 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG
 		mberGrdVO.setRegId(mberGrdVO.getMberId());
 		mberGrdVO.setEditId(mberGrdVO.getMberId());
 		
-		// Step 1. 등급제 시행 ON 일경우
+		// Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)
 		MberGrdVO mberGrdVO1 = new MberGrdVO();
 		mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
-		if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate()) {
+		if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
 			mberGrdVO.setGrdDate(mberGrdVO1.getGrdDate());
 			
 			// Step 2. /협의/스팸/비선등급 적용 제외
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 e3a93dce..284e27f0 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
@@ -15,12 +15,21 @@
 	
 	<!-- 등급제 시행여부 상세 -->
 	<select id="mberGrdDAO.selectMberSettingDetail" parameterClass="mberGrdVO" resultClass="mberGrdVO">
+	<![CDATA[
 		SELECT
 			GRD_NOTI AS grdNoti
-			, DATE_FORMAT(GRD_DATE, '%Y-%m-%d' ) AS grdDate 
+			, DATE_FORMAT(GRD_DATE, '%Y-%m-%d' ) AS grdDate
+			, CASE
+				WHEN IFNULL(GRD_DATE, '') = '' 
+					THEN 'N'						
+				WHEN DATE_FORMAT(GRD_DATE, '%Y-%m-%d') <= DATE_FORMAT(NOW(), '%Y-%m-%d') 
+					THEN 'Y'
+				ELSE 'N'
+			END grdDatePrgYn			 
 		FROM
 			MJ_MBER_SETTING
 		LIMIT 1
+	]]>
 	</select>