Commit @a580f687274e4a6a111001f491afe280ff84240a

rosewiper 2024-09-03

발송결과 30분 딜레이 처리를 위한 데이터 조회 쿼리 변경 - 발송결과리스트에 30분 딜레이 되어도 시간이 보여지는것은 정상 시간으로 보여줘야한다고 함.

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

@a580f687274e4a6a111001f491afe280ff84240a

be8286d

a580f68

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

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

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


 	private String callFromComma;
 	private String callToComma;
 	
+	private String delayYn;			//30분 딜레이 유무
+	private String delayCompleteYn;	//30분 딜레이 문자 처리 완료 유무
+	
 	public String getCallFromComma() {
 		return callFromComma;
 	}

 	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;
+	}
 	
 	
 	

be8286d

a580f68

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

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

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


 		         M2.cancelDate,
 		         M2.sendKind,
 				 M2.shipmentStatus,
+				 M2.delayYn,
+				 M2.delayCompleteYn,
 				 M2.orderByCode										
 		FROM (		
 			SELECT   COUNT(USER_ID) OVER() AS totMsgCnt,

 			         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 '예약취소'

 			                 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

be8286d

a580f68

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

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

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


 			, M2.msgKind
 			, M2.resultSValue
 			, M2.resultWFValue
+			, M2.delayYn
+			, M2.delayCompleteYn
 		FROM
 			(		
 			SELECT

                 , 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

 					, 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

Add a comment

Open 0
Closed 0

List

...	...	@@ -61,6 +61,9 @@
61	61	private String callFromComma;
62	62	private String callToComma;
63	63
	64	+ private String delayYn; //30분 딜레이 유무
	65	+ private String delayCompleteYn; //30분 딜레이 문자 처리 완료 유무
	66	+
64	67	public String getCallFromComma() {
65	68	return callFromComma;
66	69	}
...	...	@@ -319,6 +322,18 @@
319	322	public void setSendKind(String sendKind) {
320	323	this.sendKind = sendKind;
321	324	}
	325	+ public String getDelayYn() {
	326	+ return delayYn;
	327	+ }
	328	+ public void setDelayYn(String delayYn) {
	329	+ this.delayYn = delayYn;
	330	+ }
	331	+ public String getDelayCompleteYn() {
	332	+ return delayCompleteYn;
	333	+ }
	334	+ public void setDelayCompleteYn(String delayCompleteYn) {
	335	+ this.delayCompleteYn = delayCompleteYn;
	336	+ }
322	337
323	338
324	339

...	...	@@ -218,6 +218,8 @@
218	218	M2.cancelDate,
219	219	M2.sendKind,
220	220	M2.shipmentStatus,
	221	+ M2.delayYn,
	222	+ M2.delayCompleteYn,
221	223	M2.orderByCode
222	224	FROM (
223	225	SELECT COUNT(USER_ID) OVER() AS totMsgCnt,
...	...	@@ -241,7 +243,9 @@
241	243	AGENT_CODE AS agentCode,
242	244	RESERVE_C_YN AS reserveCYn,
243	245	CANCELDATE AS cancelDate,
244		- SEND_KIND as sendKind,
	246	+ SEND_KIND AS sendKind,
	247	+ DELAY_YN AS delayYn,
	248	+ DELAY_COMPLETE_YN AS delayCompleteYn,
245	249	CASE
246	250	WHEN RESERVE_C_YN = 'Y'
247	251	THEN '예약취소'
...	...	@@ -282,6 +286,8 @@
282	286	MD.CUR_STATE,
283	287	MD.RSLT_CODE,
284	288	MD.RSLT_CODE2,
	289	+ MGD.DELAY_YN,
	290	+ MGD.DELAY_COMPLETE_YN,
285	291	MGD.SEND_KIND
286	292	FROM mj_msg_data MD
287	293	INNER JOIN MJ_MSG_GROUP_DATA MGD

...	...	@@ -258,6 +258,8 @@
258	258	, M2.msgKind
259	259	, M2.resultSValue
260	260	, M2.resultWFValue
	261	+ , M2.delayYn
	262	+ , M2.delayCompleteYn
261	263	FROM
262	264	(
263	265	SELECT
...	...	@@ -303,6 +305,8 @@
303	305	, SUM(IF(RESULT = 'W' OR RESULT = 'F', 1, 0 )) AS resultWFValue
304	306	, sendKind AS sendKind
305	307	, MSG_KIND AS msgKind
	308	+ , DELAY_YN AS delayYn
	309	+ , DELAY_COMPLETE_YN AS delayCompleteYn
306	310	FROM
307	311	( SELECT
308	312	B.USER_ID
...	...	@@ -328,6 +332,8 @@
328	332	, A.RSLT_CODE2
329	333	, B.SEND_KIND as sendKind
330	334	, B.MSG_KIND
	335	+ , B.DELAY_YN
	336	+ , B.DELAY_COMPLETE_YN
331	337	, CASE
332	338	WHEN B.MSG_TYPE = '6'
333	339	AND B.FILE_CNT > 0

Delete comment