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 74102782..14331caa 100644
--- a/src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java
+++ b/src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java
@@ -58,7 +58,21 @@ public class MjonResvMsgVO extends UserDefaultVO{
private String strReqDate; // 문자열 타입 발송시간
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 int getOrderByCode() {
return orderByCode;
}
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 b5110638..ff403a6c 100644
--- a/src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java
+++ b/src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java
@@ -45,8 +45,6 @@ import itn.let.kakao.user.sent.service.KakaoSentService;
import itn.let.kakao.user.sent.service.KakaoSentVO;
import itn.let.mjo.apikey.service.ApiKeyMngService;
import itn.let.mjo.apikey.service.ApiKeyVO;
-import itn.let.mjo.msgsent.service.MjonMsgSentCntVO;
-import itn.let.mjo.msgsent.service.MjonMsgSentVO;
import itn.let.mjo.reservmsg.service.MjonMsgReservCntVO;
import itn.let.mjo.reservmsg.service.MjonReservMsgService;
import itn.let.mjo.reservmsg.service.MjonResvMsgVO;
@@ -1132,7 +1130,7 @@ public class MjonReservMsgController {
}
if(j==6) cell.setCellValue((resultAllResList.get(i)).getSmsTxt()); //내용
if(j==7) cell.setCellValue((resultAllResList.get(i)).getMsgGroupCnt()); //발송건수
- if(j==8) cell.setCellValue((resultAllResList.get(i)).getCallFrom()); //발신번호
+ if(j==8) cell.setCellValue((resultAllResList.get(i)).getCallFromComma()); //발신번호
if(j==9) cell.setCellValue(totPriceStr); //금액
//발송결과 성공, 실패 처리
@@ -1206,7 +1204,7 @@ public class MjonReservMsgController {
}
if(j==5) cell.setCellValue((resultAllResList.get(i)).getSmsTxt()); //내용
if(j==6) cell.setCellValue((resultAllResList.get(i)).getMsgGroupCnt()); //발송건수
- if(j==7) cell.setCellValue((resultAllResList.get(i)).getCallFrom()); //발신번호
+ if(j==7) cell.setCellValue((resultAllResList.get(i)).getCallFromComma()); //발신번호
if(j==8) cell.setCellValue(totPriceStr); //금액
if(j==9) cell.setCellValue((resultAllResList.get(i)).getReserveCYn()); //예약 취소
@@ -1254,7 +1252,7 @@ public class MjonReservMsgController {
}
if(j==5) cell.setCellValue((resultAllResList.get(i)).getSmsTxt()); //내용
if(j==6) cell.setCellValue((resultAllResList.get(i)).getMsgGroupCnt()); //발송건수
- if(j==7) cell.setCellValue((resultAllResList.get(i)).getCallFrom()); //발신번호
+ if(j==7) cell.setCellValue((resultAllResList.get(i)).getCallFromComma()); //발신번호
if(j==8) cell.setCellValue(totPriceStr); //금액
//발송결과 성공, 실패 처리
String resSucCnt = "0";
@@ -1326,7 +1324,7 @@ public class MjonReservMsgController {
}
if(j==5) cell.setCellValue((resultAllResList.get(i)).getSmsTxt()); //내용
if(j==6) cell.setCellValue((resultAllResList.get(i)).getMsgGroupCnt()); //발송건수
- if(j==7) cell.setCellValue((resultAllResList.get(i)).getCallFrom()); //발신번호
+ if(j==7) cell.setCellValue((resultAllResList.get(i)).getCallFromComma()); //발신번호
if(j==8) cell.setCellValue(totPriceStr); //금액
}
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 bdc4822d..cc7343f6 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
@@ -205,6 +205,7 @@
DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqdate,
TIMESTAMPDIFF(MINUTE,DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T'), DATE_FORMAT(NOW(), '%Y-%m-%d %T')) AS diffMin,
CALL_FROM AS callFrom,
+ REGEXP_REPLACE(CALL_FROM, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callFromComma,
TOT_PRICE AS totPrice,
EACH_PRICE AS eachPrice,
CUR_STATE AS curState,
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 1b9376b7..71c27302 100644
--- a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp
@@ -245,7 +245,7 @@ $(document).ready(function(){
-
+
|
diff --git a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCancelListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCancelListAjax.jsp
index 82f0bbc8..f8d3811e 100644
--- a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCancelListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCancelListAjax.jsp
@@ -201,7 +201,7 @@ $(document).ready(function(){
|
-
+
|
diff --git a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCompleteListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCompleteListAjax.jsp
index 863e0f21..1981bd28 100644
--- a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCompleteListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCompleteListAjax.jsp
@@ -70,15 +70,15 @@ $(document).ready(function(){
-
-
-
+
+
+
-
+
@@ -205,7 +205,7 @@ $(document).ready(function(){
-
+
|
diff --git a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgReadyListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgReadyListAjax.jsp
index 968405dd..36fd0ea2 100644
--- a/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgReadyListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgReadyListAjax.jsp
@@ -218,7 +218,7 @@ function fnSearch(pageNo){
|
-
+
|
| |