발송결과 문자 휴대폰번호 하이픈(-) 추가
This commit is contained in:
parent
6360aba168
commit
609c7d9cb7
@ -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;
|
||||
}
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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
|
||||
|
||||
@ -76,11 +76,11 @@ $(document).ready(function(){
|
||||
<table class="tType4">
|
||||
<colgroup>
|
||||
<col style="width: 40px;">
|
||||
<col style="width: 15%;">
|
||||
<col style="width: 12%;">
|
||||
<col style="width: 8%;">
|
||||
<col style="width: 90px;">
|
||||
<col style="width: 10%;">
|
||||
<col style="width: 12%;">
|
||||
<col style="width: 15%;">
|
||||
<col style="width: 12%;">
|
||||
<col style="width: 8%;">
|
||||
<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
|
||||
@ -206,7 +206,7 @@ $(document).ready(function(){
|
||||
<c:out value="${resultAllSentList.addrNm}"/>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:out value="${resultAllSentList.callTo}"/>
|
||||
<c:out value="${resultAllSentList.callToComma}"/>
|
||||
</c:otherwise>
|
||||
</c:choose> 외 <fmt:formatNumber value="${resultAllSentList.msgGroupCnt - 1}" pattern="#,###"/>명
|
||||
</p>
|
||||
@ -215,7 +215,7 @@ $(document).ready(function(){
|
||||
<p><c:out value="${resultAllSentList.addrNm}"/></p>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<p><c:out value="${resultAllSentList.callTo}"/></p>
|
||||
<p><c:out value="${resultAllSentList.callToComma}"/></p>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:when>
|
||||
@ -225,14 +225,14 @@ $(document).ready(function(){
|
||||
<p><c:out value="${resultAllSentList.addrNm}"/></p>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<p><c:out value="${resultAllSentList.callTo}"/></p>
|
||||
<p><c:out value="${resultAllSentList.callToComma}"/></p>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td name="listTd">
|
||||
<p><c:out value="${resultAllSentList.callFrom}"/></p>
|
||||
<p><c:out value="${resultAllSentList.callFromComma}"/></p>
|
||||
</td>
|
||||
<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
|
||||
<td name="listTd">
|
||||
|
||||
@ -69,11 +69,11 @@ $(document).ready(function(){
|
||||
<table class="tType4">
|
||||
<colgroup>
|
||||
<col style="width: 40px;">
|
||||
<col style="width: 15%;">
|
||||
<col style="width: 12%;">
|
||||
<col style="width: 8%;">
|
||||
<col style="width: 90px;">
|
||||
<col style="width: 10%;">
|
||||
<col style="width: 12%;">
|
||||
<col style="width: 15%;">
|
||||
<col style="width: 12%;">
|
||||
<col style="width: 8%;">
|
||||
<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
|
||||
@ -198,7 +198,7 @@ $(document).ready(function(){
|
||||
<c:out value="${resultAllSentList.addrNm}"/>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:out value="${resultAllSentList.callTo}"/>
|
||||
<c:out value="${resultAllSentList.callToComma}"/>
|
||||
</c:otherwise>
|
||||
</c:choose> 외 <fmt:formatNumber value="${resultAllSentList.msgGroupCnt - 1}" pattern="#,###"/>명
|
||||
</p>
|
||||
@ -207,7 +207,7 @@ $(document).ready(function(){
|
||||
<p><c:out value="${resultAllSentList.addrNm}"/></p>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<p><c:out value="${resultAllSentList.callTo}"/></p>
|
||||
<p><c:out value="${resultAllSentList.callToComma}"/></p>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:when>
|
||||
@ -217,14 +217,14 @@ $(document).ready(function(){
|
||||
<p><c:out value="${resultAllSentList.addrNm}"/></p>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<p><c:out value="${resultAllSentList.callTo}"/></p>
|
||||
<p><c:out value="${resultAllSentList.callToComma}"/></p>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td>
|
||||
<p><c:out value="${resultAllSentList.callFrom}"/></p>
|
||||
<p><c:out value="${resultAllSentList.callFromComma}"/></p>
|
||||
</td>
|
||||
<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
|
||||
<td>
|
||||
|
||||
@ -69,11 +69,11 @@ $(document).ready(function(){
|
||||
<table class="tType4">
|
||||
<colgroup>
|
||||
<col style="width: 40px;">
|
||||
<col style="width: 15%;">
|
||||
<col style="width: 12%;">
|
||||
<col style="width: 8%;">
|
||||
<col style="width: 90px;">
|
||||
<col style="width: 10%;">
|
||||
<col style="width: 12%;">
|
||||
<col style="width: 15%;">
|
||||
<col style="width: 12%;">
|
||||
<col style="width: 8%;">
|
||||
<col style="width: 8%;">
|
||||
@ -186,7 +186,7 @@ $(document).ready(function(){
|
||||
<c:out value="${resultAllSentList.addrNm}"/>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:out value="${resultAllSentList.callTo}"/>
|
||||
<c:out value="${resultAllSentList.callToComma}"/>
|
||||
</c:otherwise>
|
||||
</c:choose> 외 <fmt:formatNumber value="${resultAllSentList.msgGroupCnt - 1}" pattern="#,###"/>명
|
||||
</p>
|
||||
@ -195,7 +195,7 @@ $(document).ready(function(){
|
||||
<p><c:out value="${resultAllSentList.addrNm}"/></p>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<p><c:out value="${resultAllSentList.callTo}"/></p>
|
||||
<p><c:out value="${resultAllSentList.callToComma}"/></p>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:when>
|
||||
@ -205,14 +205,14 @@ $(document).ready(function(){
|
||||
<p><c:out value="${resultAllSentList.addrNm}"/></p>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<p><c:out value="${resultAllSentList.callTo}"/></p>
|
||||
<p><c:out value="${resultAllSentList.callToComma}"/></p>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td>
|
||||
<p><c:out value="${resultAllSentList.callFrom}"/></p>
|
||||
<p><c:out value="${resultAllSentList.callFromComma}"/></p>
|
||||
</td>
|
||||
<td>
|
||||
<p><c:out value="${resultAllSentList.msgGroupCnt}"/></p>
|
||||
|
||||
@ -69,11 +69,11 @@ $(document).ready(function(){
|
||||
<table class="tType4">
|
||||
<colgroup>
|
||||
<col style="width: 40px;">
|
||||
<col style="width: 15%;">
|
||||
<col style="width: 12%;">
|
||||
<col style="width: 8%;">
|
||||
<col style="width: 90px;">
|
||||
<col style="width: 10%;">
|
||||
<col style="width: 12%;">
|
||||
<col style="width: 15%;">
|
||||
<col style="width: 12%;">
|
||||
<col style="width: 8%;">
|
||||
<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
|
||||
@ -198,7 +198,7 @@ $(document).ready(function(){
|
||||
<c:out value="${resultAllSentList.addrNm}"/>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:out value="${resultAllSentList.callTo}"/>
|
||||
<c:out value="${resultAllSentList.callToComma}"/>
|
||||
</c:otherwise>
|
||||
</c:choose> 외 <fmt:formatNumber value="${resultAllSentList.msgGroupCnt - 1}" pattern="#,###"/>명
|
||||
</p>
|
||||
@ -207,7 +207,7 @@ $(document).ready(function(){
|
||||
<p><c:out value="${resultAllSentList.addrNm}"/></p>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<p><c:out value="${resultAllSentList.callTo}"/></p>
|
||||
<p><c:out value="${resultAllSentList.callToComma}"/></p>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:when>
|
||||
@ -217,14 +217,14 @@ $(document).ready(function(){
|
||||
<p><c:out value="${resultAllSentList.addrNm}"/></p>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<p><c:out value="${resultAllSentList.callTo}"/></p>
|
||||
<p><c:out value="${resultAllSentList.callToComma}"/></p>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td>
|
||||
<p><c:out value="${resultAllSentList.callFrom}"/></p>
|
||||
<p><c:out value="${resultAllSentList.callFromComma}"/></p>
|
||||
</td>
|
||||
<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
|
||||
<td>
|
||||
|
||||
@ -237,7 +237,7 @@ function linkPage(pageNo){
|
||||
<c:out value="${resultAllSentList.addrNm}"/>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:out value="${resultAllSentList.callTo}"/>
|
||||
<c:out value="${resultAllSentList.callToComma}"/>
|
||||
</c:otherwise>
|
||||
</c:choose> 외 <c:out value="${resultAllSentList.msgGroupCnt - 1}"/>명
|
||||
</p>
|
||||
@ -246,7 +246,7 @@ function linkPage(pageNo){
|
||||
<p><c:out value="${resultAllSentList.addrNm}"/></p>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<p><c:out value="${resultAllSentList.callTo}"/></p>
|
||||
<p><c:out value="${resultAllSentList.callToComma}"/></p>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:when>
|
||||
@ -256,14 +256,14 @@ function linkPage(pageNo){
|
||||
<p><c:out value="${resultAllSentList.addrNm}"/></p>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<p><c:out value="${resultAllSentList.callTo}"/></p>
|
||||
<p><c:out value="${resultAllSentList.callToComma}"/></p>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td>
|
||||
<p><c:out value="${resultAllSentList.callFrom}"/></p>
|
||||
<p><c:out value="${resultAllSentList.callFromComma}"/></p>
|
||||
</td>
|
||||
<td>
|
||||
<p><c:out value="${resultAllSentList.msgGroupCnt}"/></p>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user