From 609c7d9cb769361d2645266b15eba2608b4007b1 Mon Sep 17 00:00:00 2001 From: itn Date: Wed, 13 Sep 2023 16:30:53 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=ED=9C=B4=EB=8C=80=ED=8F=B0=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=ED=95=98=EC=9D=B4=ED=94=88(-)=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/mjo/msgsent/service/MjonMsgSentVO.java | 16 ++++++++++++++++ .../mjo/msgsent/web/MjonMsgSentController.java | 4 ++-- .../sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml | 6 ++++++ .../jsp/web/msgsent/MsgSentAllListAjax.jsp | 12 ++++++------ .../jsp/web/msgsent/MsgSentCompleteListAjax.jsp | 12 ++++++------ .../jsp/web/msgsent/MsgSentFailListAjax.jsp | 12 ++++++------ .../jsp/web/msgsent/MsgSentReadyListAjax.jsp | 12 ++++++------ .../jsp/web/msgsent/MsgSentSFDetailListAjax.jsp | 8 ++++---- 8 files changed, 52 insertions(+), 30 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 87e15895..1e84512a 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java +++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java @@ -79,6 +79,22 @@ public class MjonMsgSentVO extends UserDefaultVO{ private String sendKind; // 그림문자 파일정보 + private String callFromComma; + private String callToComma; + + public String getCallFromComma() { + return callFromComma; + } + public void setCallFromComma(String callFromComma) { + this.callFromComma = callFromComma; + } + public String getCallToComma() { + return callToComma; + } + public void setCallToComma(String callToComma) { + this.callToComma = callToComma; + } + public String getAtchFiles() { return atchFiles; } diff --git a/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java b/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java index 7928a599..1e4e0875 100644 --- a/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java +++ b/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java @@ -1197,8 +1197,8 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll } if(j==3) cell.setCellValue((resultAllSentList.get(i)).getSmsTxt()); //내용 if(j==4) cell.setCellValue((resultAllSentList.get(i)).getAddrNm()); - if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallTo()); - if(j==6) cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); //발신번호 + if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallToComma()); + if(j==6) cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); //발신번호 if(j==7) { //발송상태 처리해주기 String resvCYn = resultAllSentList.get(i).getReserveCYn(); 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 1e7b7c9e..78665a79 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 @@ -236,6 +236,8 @@ , DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqdate , CALL_FROM AS callFrom , CALL_TO AS callTo + , REGEXP_REPLACE(CALL_FROM, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callFromComma + , REGEXP_REPLACE(CALL_TO, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callToComma , IFNULL(ADDR_NM, '-') AS addrNm , TOT_PRICE AS totPrice , EACH_PRICE AS eachPrice @@ -442,6 +444,8 @@ , DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqdate , CALL_FROM AS callFrom , CALL_TO AS callTo + , REGEXP_REPLACE(CALL_FROM, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callFromComma + , REGEXP_REPLACE(CALL_TO, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callToComma , TOT_PRICE AS totPrice , EACH_PRICE AS eachPrice , CUR_STATE AS curState @@ -632,6 +636,8 @@ , DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqdate , CALL_FROM AS callFrom , CALL_TO AS callTo + , REGEXP_REPLACE(CALL_FROM, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callFromComma + , REGEXP_REPLACE(CALL_TO, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callToComma , TOT_PRICE AS totPrice , EACH_PRICE AS eachPrice , CUR_STATE AS curState 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 deece58f..64f93ec6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp @@ -76,11 +76,11 @@ $(document).ready(function(){ - + - + @@ -206,7 +206,7 @@ $(document).ready(function(){ - + 외 명

@@ -215,7 +215,7 @@ $(document).ready(function(){

-

+

@@ -225,14 +225,14 @@ $(document).ready(function(){

-

+

-

+

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 a5de4765..307c7769 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp @@ -69,11 +69,11 @@ $(document).ready(function(){ - + - + @@ -198,7 +198,7 @@ $(document).ready(function(){ - + 외 명

@@ -207,7 +207,7 @@ $(document).ready(function(){

-

+

@@ -217,14 +217,14 @@ $(document).ready(function(){

-

+

-

+

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 9f2c1031..e04657e8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp @@ -69,11 +69,11 @@ $(document).ready(function(){ - + - + @@ -186,7 +186,7 @@ $(document).ready(function(){ - + 외 명

@@ -195,7 +195,7 @@ $(document).ready(function(){

-

+

@@ -205,14 +205,14 @@ $(document).ready(function(){

-

+

-

+

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 f4958edb..9e3d0f16 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp @@ -69,11 +69,11 @@ $(document).ready(function(){ - + - + @@ -198,7 +198,7 @@ $(document).ready(function(){ - + 외 명

@@ -207,7 +207,7 @@ $(document).ready(function(){

-

+

@@ -217,14 +217,14 @@ $(document).ready(function(){

-

+

-

+

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentSFDetailListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentSFDetailListAjax.jsp index c82d585f..bb48c9d4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentSFDetailListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentSFDetailListAjax.jsp @@ -237,7 +237,7 @@ function linkPage(pageNo){ - + 외 명

@@ -246,7 +246,7 @@ function linkPage(pageNo){

-

+

@@ -256,14 +256,14 @@ function linkPage(pageNo){

-

+

-

+