tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

예약관리 문자 휴대폰번호 하이픈(-) 추가

Browse Source
This commit is contained in:
itn 2023-09-13 16:50:50 +09:00
parent 38cfd5e82c
commit 1452e55590
7 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java
View File

@ -58,7 +58,21 @@ public class MjonResvMsgVO extends UserDefaultVO{
private String strReqDate; // 문자열 타입 발송시간 private String strReqDate; // 문자열 타입 발송시간
private String sendKind; // 문자열 타입 발송시간 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() { public int getOrderByCode() {
return orderByCode; return orderByCode;
} }

10
src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java
View File

@ -45,8 +45,6 @@ import itn.let.kakao.user.sent.service.KakaoSentService;
import itn.let.kakao.user.sent.service.KakaoSentVO; import itn.let.kakao.user.sent.service.KakaoSentVO;
import itn.let.mjo.apikey.service.ApiKeyMngService; import itn.let.mjo.apikey.service.ApiKeyMngService;
import itn.let.mjo.apikey.service.ApiKeyVO; 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.MjonMsgReservCntVO;
import itn.let.mjo.reservmsg.service.MjonReservMsgService; import itn.let.mjo.reservmsg.service.MjonReservMsgService;
import itn.let.mjo.reservmsg.service.MjonResvMsgVO; 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==6) cell.setCellValue((resultAllResList.get(i)).getSmsTxt()); //내용
if(j==7) cell.setCellValue((resultAllResList.get(i)).getMsgGroupCnt()); //발송건수 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); //금액 if(j==9) cell.setCellValue(totPriceStr); //금액
//발송결과 성공, 실패 처리 //발송결과 성공, 실패 처리
@ -1206,7 +1204,7 @@ public class MjonReservMsgController {
} }
if(j==5) cell.setCellValue((resultAllResList.get(i)).getSmsTxt()); //내용 if(j==5) cell.setCellValue((resultAllResList.get(i)).getSmsTxt()); //내용
if(j==6) cell.setCellValue((resultAllResList.get(i)).getMsgGroupCnt()); //발송건수 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==8) cell.setCellValue(totPriceStr); //금액
if(j==9) cell.setCellValue((resultAllResList.get(i)).getReserveCYn()); //예약 취소 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==5) cell.setCellValue((resultAllResList.get(i)).getSmsTxt()); //내용
if(j==6) cell.setCellValue((resultAllResList.get(i)).getMsgGroupCnt()); //발송건수 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==8) cell.setCellValue(totPriceStr); //금액
//발송결과 성공, 실패 처리 //발송결과 성공, 실패 처리
String resSucCnt = "0"; String resSucCnt = "0";
@ -1326,7 +1324,7 @@ public class MjonReservMsgController {
} }
if(j==5) cell.setCellValue((resultAllResList.get(i)).getSmsTxt()); //내용 if(j==5) cell.setCellValue((resultAllResList.get(i)).getSmsTxt()); //내용
if(j==6) cell.setCellValue((resultAllResList.get(i)).getMsgGroupCnt()); //발송건수 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==8) cell.setCellValue(totPriceStr); //금액
} }

1
src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml
View File

@ -205,6 +205,7 @@
DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqdate, 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, TIMESTAMPDIFF(MINUTE,DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T'), DATE_FORMAT(NOW(), '%Y-%m-%d %T')) AS diffMin,
CALL_FROM AS callFrom, CALL_FROM AS callFrom,
REGEXP_REPLACE(CALL_FROM, '(02|.{3})(.+)(.{4})', '\\1-\\2-\\3') AS callFromComma,
TOT_PRICE AS totPrice, TOT_PRICE AS totPrice,
EACH_PRICE AS eachPrice, EACH_PRICE AS eachPrice,
CUR_STATE AS curState, CUR_STATE AS curState,

2
src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp
View File

@ -245,7 +245,7 @@ $(document).ready(function(){
<p><c:out value="${resultAllResList.msgGroupCnt}"/></p> <p><c:out value="${resultAllResList.msgGroupCnt}"/></p>
</td> </td>
<td> <td>
<p><c:out value="${resultAllResList.callFrom}"/></p> <p><c:out value="${resultAllResList.callFromComma}"/></p>
</td> </td>
<td> <td>
<p> <p>

2
src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCancelListAjax.jsp
View File

@ -201,7 +201,7 @@ $(document).ready(function(){
<p><c:out value="${resultAllResList.msgGroupCnt}"/></p> <p><c:out value="${resultAllResList.msgGroupCnt}"/></p>
</td> </td>
<td> <td>
<p><c:out value="${resultAllResList.callFrom}"/></p> <p><c:out value="${resultAllResList.callFromComma}"/></p>
</td> </td>
<td> <td>
<p> <p>

10
src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCompleteListAjax.jsp
View File

@ -70,15 +70,15 @@ $(document).ready(function(){
<table class="tType4"> <table class="tType4">
<colgroup> <colgroup>
<col style="width: 40px;"> <col style="width: 40px;">
<col style="width: 15%;"> <col style="width: 14%;">
<col style="width: 15%;"> <col style="width: 14%;">
<col style="width: 15%;"> <col style="width: 14%;">
<col style="width: 7%;"> <col style="width: 7%;">
<col style="width: 10%;"> <col style="width: 10%;">
<col style="width: 90px;"> <col style="width: 90px;">
<col style="width: 10%;"> <col style="width: 10%;">
<col style="width: 10%;"> <col style="width: 13%;">
<col style="width: 15%;"> <col style="width: 15%;">
</colgroup> </colgroup>
<thead> <thead>
@ -205,7 +205,7 @@ $(document).ready(function(){
<p><c:out value="${resultAllResList.msgGroupCnt}"/></p> <p><c:out value="${resultAllResList.msgGroupCnt}"/></p>
</td> </td>
<td> <td>
<p><c:out value="${resultAllResList.callFrom}"/></p> <p><c:out value="${resultAllResList.callFromComma}"/></p>
</td> </td>
<td> <td>
<p> <p>

2
src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgReadyListAjax.jsp
View File

@ -218,7 +218,7 @@ function fnSearch(pageNo){
<p><c:out value="${resultAllResList.msgGroupCnt}"/></p> <p><c:out value="${resultAllResList.msgGroupCnt}"/></p>
</td> </td>
<td> <td>
<p><c:out value="${resultAllResList.callFrom}"/></p> <p><c:out value="${resultAllResList.callFromComma}"/></p>
</td> </td>
<td> <td>
<p> <p>