발송결과 문자 휴대폰번호 하이픈(-) 추가
This commit is contained in:
parent
1452e55590
commit
cf5560d28e
@ -96,6 +96,21 @@ public class KakaoSentVO extends UserDefaultVO{
|
|||||||
private int kakaoResendFailCount;
|
private int kakaoResendFailCount;
|
||||||
|
|
||||||
private String diffMin; //현재시간과 발송예약시간 차이값
|
private String diffMin; //현재시간과 발송예약시간 차이값
|
||||||
|
private String callToComma;
|
||||||
|
private String callFromComma;
|
||||||
|
|
||||||
|
public String getCallToComma() {
|
||||||
|
return callToComma;
|
||||||
|
}
|
||||||
|
public void setCallToComma(String callToComma) {
|
||||||
|
this.callToComma = callToComma;
|
||||||
|
}
|
||||||
|
public String getCallFromComma() {
|
||||||
|
return callFromComma;
|
||||||
|
}
|
||||||
|
public void setCallFromComma(String callFromComma) {
|
||||||
|
this.callFromComma = callFromComma;
|
||||||
|
}
|
||||||
|
|
||||||
public String getAtchFiles() {
|
public String getAtchFiles() {
|
||||||
return atchFiles;
|
return atchFiles;
|
||||||
|
|||||||
@ -676,8 +676,8 @@ public class KakaoSentController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(j==3) cell.setCellValue((resultAllSentList.get(i)).getSmsTxt()); //내용
|
if(j==3) cell.setCellValue((resultAllSentList.get(i)).getSmsTxt()); //내용
|
||||||
if(j==4) cell.setCellValue((resultAllSentList.get(i)).getCallTo());
|
if(j==4) cell.setCellValue((resultAllSentList.get(i)).getCallToComma());
|
||||||
if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); //발신번호
|
if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); //발신번호
|
||||||
if(j==6) cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt()); //발송건수
|
if(j==6) cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt()); //발송건수
|
||||||
|
|
||||||
//발송결과 성공, 실패 처리
|
//발송결과 성공, 실패 처리
|
||||||
@ -787,8 +787,8 @@ public class KakaoSentController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(j==3) cell.setCellValue((resultAllSentList.get(i)).getSmsTxt()); //내용
|
if(j==3) cell.setCellValue((resultAllSentList.get(i)).getSmsTxt()); //내용
|
||||||
if(j==4) cell.setCellValue((resultAllSentList.get(i)).getCallTo());
|
if(j==4) cell.setCellValue((resultAllSentList.get(i)).getCallToComma());
|
||||||
if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallFrom()); //발신번호
|
if(j==5) cell.setCellValue((resultAllSentList.get(i)).getCallFromComma()); //발신번호
|
||||||
if(j==6) cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt()); //발송건수
|
if(j==6) cell.setCellValue((resultAllSentList.get(i)).getMsgGroupCnt()); //발송건수
|
||||||
|
|
||||||
//카카오톡 결과
|
//카카오톡 결과
|
||||||
|
|||||||
@ -213,6 +213,8 @@
|
|||||||
M2.rsltDate ,
|
M2.rsltDate ,
|
||||||
M2.callFrom ,
|
M2.callFrom ,
|
||||||
M2.callTo ,
|
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.addrNm ,
|
||||||
M2.totPrice ,
|
M2.totPrice ,
|
||||||
M2.eachPrice ,
|
M2.eachPrice ,
|
||||||
@ -490,6 +492,8 @@
|
|||||||
, DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqdate
|
, DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqdate
|
||||||
, CALL_FROM AS callFrom
|
, CALL_FROM AS callFrom
|
||||||
, CALL_TO AS callTo
|
, 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
|
, TOT_PRICE AS totPrice
|
||||||
, EACH_PRICE AS eachPrice
|
, EACH_PRICE AS eachPrice
|
||||||
, CUR_STATE AS curState
|
, CUR_STATE AS curState
|
||||||
|
|||||||
@ -163,7 +163,7 @@ $(document).ready(function(){
|
|||||||
<c:out value="${resultAllSentList.addrNm}"/>
|
<c:out value="${resultAllSentList.addrNm}"/>
|
||||||
</c:when>
|
</c:when>
|
||||||
<c:otherwise>
|
<c:otherwise>
|
||||||
<c:out value="${resultAllSentList.callTo}"/>
|
<c:out value="${resultAllSentList.callToComma}"/>
|
||||||
</c:otherwise>
|
</c:otherwise>
|
||||||
</c:choose> 외 <fmt:formatNumber value="${resultAllSentList.msgGroupCnt - 1}" pattern="#,###"/>명
|
</c:choose> 외 <fmt:formatNumber value="${resultAllSentList.msgGroupCnt - 1}" pattern="#,###"/>명
|
||||||
</p>
|
</p>
|
||||||
@ -172,11 +172,11 @@ $(document).ready(function(){
|
|||||||
<p><c:out value="${resultAllSentList.addrNm}"/></p>
|
<p><c:out value="${resultAllSentList.addrNm}"/></p>
|
||||||
</c:when>
|
</c:when>
|
||||||
<c:otherwise>
|
<c:otherwise>
|
||||||
<p><c:out value="${resultAllSentList.callTo}"/></p>
|
<p><c:out value="${resultAllSentList.callToComma}"/></p>
|
||||||
</c:otherwise>
|
</c:otherwise>
|
||||||
</c:choose>
|
</c:choose>
|
||||||
</td>
|
</td>
|
||||||
<td rowspan="2"><p><c:out value="${resultAllSentList.callFrom}"/></p></td>
|
<td rowspan="2"><p><c:out value="${resultAllSentList.callFromComma}"/></p></td>
|
||||||
<td rowspan="2"><p><c:out value="${resultAllSentList.msgGroupCnt}"/></p></td>
|
<td rowspan="2"><p><c:out value="${resultAllSentList.msgGroupCnt}"/></p></td>
|
||||||
|
|
||||||
|
|
||||||
@ -309,7 +309,7 @@ $(document).ready(function(){
|
|||||||
<c:out value="${resultAllSentList.addrNm}"/>
|
<c:out value="${resultAllSentList.addrNm}"/>
|
||||||
</c:when>
|
</c:when>
|
||||||
<c:otherwise>
|
<c:otherwise>
|
||||||
<c:out value="${resultAllSentList.callTo}"/>
|
<c:out value="${resultAllSentList.callToComma}"/>
|
||||||
</c:otherwise>
|
</c:otherwise>
|
||||||
</c:choose> 외 <fmt:formatNumber value="${resultAllSentList.msgGroupCnt - 1}" pattern="#,###"/>명
|
</c:choose> 외 <fmt:formatNumber value="${resultAllSentList.msgGroupCnt - 1}" pattern="#,###"/>명
|
||||||
</p>
|
</p>
|
||||||
@ -318,11 +318,11 @@ $(document).ready(function(){
|
|||||||
<p><c:out value="${resultAllSentList.addrNm}"/></p>
|
<p><c:out value="${resultAllSentList.addrNm}"/></p>
|
||||||
</c:when>
|
</c:when>
|
||||||
<c:otherwise>
|
<c:otherwise>
|
||||||
<p><c:out value="${resultAllSentList.callTo}"/></p>
|
<p><c:out value="${resultAllSentList.callToComma}"/></p>
|
||||||
</c:otherwise>
|
</c:otherwise>
|
||||||
</c:choose>
|
</c:choose>
|
||||||
</td>
|
</td>
|
||||||
<td><p><c:out value="${resultAllSentList.callFrom}"/></p></td>
|
<td><p><c:out value="${resultAllSentList.callFromComma}"/></p></td>
|
||||||
<td>
|
<td>
|
||||||
<c:choose>
|
<c:choose>
|
||||||
<c:when test="${resultAllSentList.msgResult eq 'S'}">
|
<c:when test="${resultAllSentList.msgResult eq 'S'}">
|
||||||
|
|||||||
@ -196,7 +196,7 @@ function listSortOrd(obj){
|
|||||||
<c:out value="${resultAllSentList.addrNm}"/>
|
<c:out value="${resultAllSentList.addrNm}"/>
|
||||||
</c:when>
|
</c:when>
|
||||||
<c:otherwise>
|
<c:otherwise>
|
||||||
<c:out value="${resultAllSentList.callTo}"/>
|
<c:out value="${resultAllSentList.callToComma}"/>
|
||||||
</c:otherwise>
|
</c:otherwise>
|
||||||
</c:choose>
|
</c:choose>
|
||||||
</c:when>
|
</c:when>
|
||||||
@ -204,13 +204,13 @@ function listSortOrd(obj){
|
|||||||
<p><c:out value="${resultAllSentList.addrNm}"/></p>
|
<p><c:out value="${resultAllSentList.addrNm}"/></p>
|
||||||
</c:when>
|
</c:when>
|
||||||
<c:otherwise>
|
<c:otherwise>
|
||||||
<p><c:out value="${resultAllSentList.callTo}"/></p>
|
<p><c:out value="${resultAllSentList.callToComma}"/></p>
|
||||||
</c:otherwise>
|
</c:otherwise>
|
||||||
</c:choose>
|
</c:choose>
|
||||||
</p>
|
</p>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<p><c:out value="${resultAllSentList.callFrom}"/></p>
|
<p><c:out value="${resultAllSentList.callFromComma}"/></p>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<c:choose>
|
<c:choose>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user