발송결과 30분 딜레이 처리를 위한 데이터 조회 쿼리 변경

- 발송결과리스트에 30분 딜레이 되어도 시간이 보여지는것은 정상 시간으로 보여줘야한다고 함.

src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java

@@ -61,6 +61,9 @@ public class MjonResvMsgVO extends UserDefaultVO{
 	private String callFromComma;
 	private String callToComma;
 	
+	private String delayYn;			//30분 딜레이 유무
+	private String delayCompleteYn;	//30분 딜레이 문자 처리 완료 유무
+	
 	public String getCallFromComma() {
 		return callFromComma;
 	}
@@ -319,6 +322,18 @@ public class MjonResvMsgVO extends UserDefaultVO{
 	public void setSendKind(String sendKind) {
 		this.sendKind = sendKind;
 	}
+	public String getDelayYn() {
+		return delayYn;
+	}
+	public void setDelayYn(String delayYn) {
+		this.delayYn = delayYn;
+	}
+	public String getDelayCompleteYn() {
+		return delayCompleteYn;
+	}
+	public void setDelayCompleteYn(String delayCompleteYn) {
+		this.delayCompleteYn = delayCompleteYn;
+	}
 	
 	
 	

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml

@@ -218,6 +218,8 @@
 		         M2.cancelDate,
 		         M2.sendKind,
 				 M2.shipmentStatus,
+				 M2.delayYn,
+				 M2.delayCompleteYn,
 				 M2.orderByCode										
 		FROM (		
 			SELECT   COUNT(USER_ID) OVER() AS totMsgCnt,
@@ -241,7 +243,9 @@
 			         AGENT_CODE AS agentCode,
 			         RESERVE_C_YN AS reserveCYn,
 			         CANCELDATE AS cancelDate,
-			         SEND_KIND as sendKind,
+			         SEND_KIND AS sendKind,
+			         DELAY_YN AS delayYn,
+			         DELAY_COMPLETE_YN AS delayCompleteYn,
 					CASE
 						WHEN RESERVE_C_YN = 'Y'
 						THEN '예약취소'
@@ -282,6 +286,8 @@
 			                 MD.CUR_STATE,
 			                 MD.RSLT_CODE,
 			                 MD.RSLT_CODE2,
+			                 MGD.DELAY_YN,
+			                 MGD.DELAY_COMPLETE_YN,
 							 MGD.SEND_KIND
 			         FROM    mj_msg_data MD
 			                 INNER JOIN MJ_MSG_GROUP_DATA MGD

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml

@@ -258,6 +258,8 @@
 			, M2.msgKind
 			, M2.resultSValue
 			, M2.resultWFValue
+			, M2.delayYn
+			, M2.delayCompleteYn
 		FROM
 			(		
 			SELECT
@@ -303,6 +305,8 @@
                 , SUM(IF(RESULT = 'W' OR RESULT = 'F', 1, 0 ))	AS resultWFValue
 				, sendKind						 AS sendKind
 				, MSG_KIND						 AS msgKind
+				, DELAY_YN						 AS delayYn
+				, DELAY_COMPLETE_YN				 AS delayCompleteYn
 			FROM
 				( SELECT
 					B.USER_ID
@@ -328,6 +332,8 @@
 					, A.RSLT_CODE2
 					, B.SEND_KIND as sendKind
 					, B.MSG_KIND
+					, B.DELAY_YN
+					, B.DELAY_COMPLETE_YN
 					, CASE
 						WHEN B.MSG_TYPE = '6'
 							AND B.FILE_CNT > 0