From 681b96dd047973a957e784055daacc0623061edb Mon Sep 17 00:00:00 2001 From: itn Date: Thu, 14 Sep 2023 12:00:16 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=88=EC=95=BD=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=20=ED=9C=B4=EB=8C=80=ED=8F=B0?= =?UTF-8?q?=EB=B2=88=ED=98=B8=20=ED=95=98=EC=9D=B4=ED=94=88(-)=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/mjo/reservmsg/web/MjonReservMsgController.java | 8 ++++---- .../sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml | 2 ++ .../jsp/web/reservedmsg/ReservedKakaoAllListAjax.jsp | 8 ++++---- .../jsp/web/reservedmsg/ReservedKakaoCancelListAjax.jsp | 2 +- .../jsp/web/reservedmsg/ReservedKakaoCompleteListAjax.jsp | 2 +- .../jsp/web/reservedmsg/ReservedKakaoReadyListAjax.jsp | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java b/src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java index ff403a6c..d1355fb4 100644 --- a/src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java +++ b/src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java @@ -1878,7 +1878,7 @@ public class MjonReservMsgController { } if(j==5) cell.setCellValue((resultAllSentList.get(i)).getSmsTxt()); //내용 if(j==6) cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt()); //발송건수 - if(j==7) cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); //발신번호 + if(j==7) cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); //발신번호 if(j==8) cell.setCellValue((resultAllSentList.get(i)).getTotPrice()); //발신번호 //발송결과 성공, 실패 처리 @@ -1987,7 +1987,7 @@ public class MjonReservMsgController { if (j == 5) cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt()); // 발송건수 if (j == 6) - cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); // 발신번호 + cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); // 발신번호 if (j == 7) cell.setCellValue((resultAllSentList.get(i)).getTotPrice()); // 발신번호 if (j == 8) { @@ -2175,7 +2175,7 @@ public class MjonReservMsgController { if (j == 6) cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt()); // 발송건수 if (j == 7) - cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); // 발신번호 + cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); // 발신번호 if (j == 8) cell.setCellValue((resultAllSentList.get(i)).getTotPrice()); // 발신번호 @@ -2284,7 +2284,7 @@ public class MjonReservMsgController { if (j == 6) cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt()); // 발송건수 if (j == 7) - cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); // 발신번호 + cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); // 발신번호 if (j == 8) cell.setCellValue((resultAllSentList.get(i)).getTotPrice()); // 발신번호 } diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml index 5b702413..756e72df 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml @@ -1002,6 +1002,8 @@ M2.diffMin, M2.callFrom , M2.callTo , + REGEXP_REPLACE(M2.callFrom, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callFromComma, + REGEXP_REPLACE(M2.callTo, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callToComma, M2.addrNm , M2.totPrice , M2.eachPrice , diff --git a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoAllListAjax.jsp index d5703774..ef385386 100644 --- a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoAllListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoAllListAjax.jsp @@ -72,12 +72,12 @@ $(document).ready(function(){ - - + + - + @@ -254,7 +254,7 @@ $(document).ready(function(){

-

+

diff --git a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoCancelListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoCancelListAjax.jsp index e83f3fd7..86391651 100644 --- a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoCancelListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoCancelListAjax.jsp @@ -211,7 +211,7 @@ $(document).ready(function(){

-

+

diff --git a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoCompleteListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoCompleteListAjax.jsp index 1130e8f7..9e180132 100644 --- a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoCompleteListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoCompleteListAjax.jsp @@ -209,7 +209,7 @@ $(document).ready(function(){

-

+

diff --git a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoReadyListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoReadyListAjax.jsp index bff09ca9..10b69807 100644 --- a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoReadyListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedKakaoReadyListAjax.jsp @@ -225,7 +225,7 @@ function fnSearch(pageNo){

-

+