From d3232e2ceb3f60792c16faca8ead86dd01546288 Mon Sep 17 00:00:00 2001 From: rosewiper Date: Wed, 4 Sep 2024 10:16:10 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EB=B0=9C?= =?UTF-8?q?=EC=86=A1=EA=B2=B0=EA=B3=BC,=20=EC=98=88=EC=95=BD=EB=B0=9C?= =?UTF-8?q?=EC=86=A1=EA=B2=B0=EA=B3=BC=20=ED=99=94=EB=A9=B4=2030=EB=B6=84?= =?UTF-8?q?=20=EB=94=9C=EB=A0=88=EC=9D=B4=EC=8B=9C=20=EB=B0=9C=EC=86=A1?= =?UTF-8?q?=EC=8B=9C=EA=B0=84=EC=9D=84=2030=EB=B6=84=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=20=EB=90=98=EC=A7=80=20=EC=95=8A=EC=9D=80=20=EC=8B=9C=EA=B0=84?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=ED=91=9C=EC=8B=9C=20=EB=90=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/let/mjo/msgsent/service/MjonMsgSentVO.java | 7 +++++++ .../itn/let/mjo/reservmsg/service/MjonResvMsgVO.java | 9 +++++++++ .../sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml | 1 + .../sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml | 8 ++++++++ .../WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp | 10 +++++++++- .../jsp/web/msgsent/MsgSentCompleteListAjax.jsp | 10 +++++++++- .../WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp | 10 +++++++++- .../WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp | 10 +++++++++- .../jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp | 11 ++++++++++- 9 files changed, 71 insertions(+), 5 deletions(-) diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java index 93b00b18..f7478240 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java +++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java @@ -73,6 +73,7 @@ public class MjonMsgSentVO extends UserDefaultVO{ private String msgKind; //문자종류(일반:N, 광고:A , 선거:C, 관리자:S, 이벤트:E) private String delayYn; //지연 문자 유무 private String delayCompleteYn; //지연문자 처리 완료 여부 + private Date delayOrgTime; //30분 딜레이된 발송시간에서 -30분 처리하여 원래 보내려던 발송시간 처리 private String msgId; //문자아이디 private String atchFiles; // 그림문자 파일정보 @@ -473,5 +474,11 @@ public class MjonMsgSentVO extends UserDefaultVO{ public void setResultWFValue(String resultWFValue) { this.resultWFValue = resultWFValue; } + public Date getDelayOrgTime() { + return delayOrgTime; + } + public void setDelayOrgTime(Date delayOrgTime) { + this.delayOrgTime = delayOrgTime; + } } diff --git a/src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java b/src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java index 4c90cde3..a926dd78 100644 --- a/src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java +++ b/src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java @@ -64,6 +64,8 @@ public class MjonResvMsgVO extends UserDefaultVO{ private String delayYn; //30분 딜레이 유무 private String delayCompleteYn; //30분 딜레이 문자 처리 완료 유무 + private Date delayOrgTime; //30분 딜레이된 발송시간에서 -30분 처리하여 원래 보내려던 발송시간 처리 + public String getCallFromComma() { return callFromComma; } @@ -334,6 +336,13 @@ public class MjonResvMsgVO extends UserDefaultVO{ public void setDelayCompleteYn(String delayCompleteYn) { this.delayCompleteYn = delayCompleteYn; } + public Date getDelayOrgTime() { + return delayOrgTime; + } + public void setDelayOrgTime(Date delayOrgTime) { + this.delayOrgTime = delayOrgTime; + } + diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml index 98dbda48..e8e803dd 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml @@ -202,6 +202,7 @@ M2.subject, M2.regdate, M2.reqdate, + IF(delayYn = 'Y' and delayCompleteYn = 'N', DATE_ADD(M2.reqdate, INTERVAL -30 MINUTE), M2.reqdate) AS delayOrgTime, M2.diffMin, M2.callFrom, FN_GETHYPHEN(M2.callFrom) AS callFromComma, diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml index 75b0da36..a9209770 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml @@ -233,6 +233,7 @@ , M2.subject , M2.regdate , M2.reqdate + , IF(delayYn = 'Y' and delayCompleteYn = 'N', DATE_ADD(M2.reqdate, INTERVAL -30 MINUTE), M2.reqdate) AS delayOrgTime , M2.callFrom , M2.callTo , FN_GETHYPHEN(M2.callFrom) AS callFromComma @@ -628,6 +629,7 @@ , M2.subject , M2.regdate , M2.reqdate + , IF(delayYn = 'Y' and delayCompleteYn = 'N', DATE_ADD(M2.reqdate, INTERVAL -30 MINUTE), M2.reqdate) AS delayOrgTime , M2.callFrom , M2.callTo , FN_GETHYPHEN(M2.callFrom) AS callFromComma @@ -647,6 +649,8 @@ , M2.msgId , M2.msgResult , M2.sendKind + , M2.delayYn + , M2.delayCompleteYn FROM ( SELECT @@ -667,6 +671,8 @@ , CUR_STATE AS curState , RSLT_CODE AS rsltCode , RSLT_CODE2 AS rsltCode2 + , DELAY_YN AS delayYn + , DELAY_COMPLETE_YN AS delayCompleteYn , IF( (RSLT_CODE != '0' AND RSLT_CODE != '100' AND RSLT_CODE != '101' @@ -713,6 +719,8 @@ , MD.CUR_STATE , MD.RSLT_CODE , MD.RSLT_CODE2 + , MGD.DELAY_YN + , MGD.DELAY_COMPLETE_YN , MGD.SEND_KIND AS sendKind ,() AS RESULT FROM diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp index 02541146..f0102561 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp @@ -173,7 +173,15 @@ $(document).ready(function(){ -

+ + + <%-- 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 --%> +

+ + +

+ +

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp index 307c7769..1465db60 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp @@ -152,7 +152,15 @@ $(document).ready(function(){ -

+ + + <%-- 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 --%> +

+ + +

+ +

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp index 9cce9597..6917b941 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp @@ -140,7 +140,15 @@ $(document).ready(function(){ -

+ + + <%-- 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 --%> +

+ + +

+ +

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp index 4a40522e..a1803bcf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp @@ -152,7 +152,15 @@ $(document).ready(function(){ -

+ + + <%-- 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 --%> +

+ + +

+ +

diff --git a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp index 71c27302..5a9c1bdf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp @@ -202,7 +202,16 @@ $(document).ready(function(){

-

+ + + <%-- 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 --%> +

+ + +

+ + +