--- src/main/java/itn/com/cmm/util/DateUtils.java
+++ src/main/java/itn/com/cmm/util/DateUtils.java
... | ... | @@ -194,7 +194,6 @@ |
| 194 | 194 |
LocalDateTime dateTime = LocalDateTime.parse(str, inputFormatter); |
| 195 | 195 |
|
| 196 | 196 |
// 원하는 출력 포맷 적용 |
| 197 |
-// DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("MM-dd HH:mm");
|
|
| 198 | 197 |
DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern(formatter); |
| 199 | 198 |
String formattedDate = dateTime.format(outputFormatter); |
| 200 | 199 |
|
--- src/main/java/itn/com/cmm/util/MsgSendUtils.java
+++ src/main/java/itn/com/cmm/util/MsgSendUtils.java
... | ... | @@ -276,7 +276,6 @@ |
| 276 | 276 |
for (Map.Entry<String, Function<MjonMsgSendVO, String>> entry : placeholders.entrySet()) {
|
| 277 | 277 |
String placeholder = entry.getKey(); |
| 278 | 278 |
String value = entry.getValue().apply(sendVO); |
| 279 |
- System.out.println("");
|
|
| 280 | 279 |
// log.info(" + smsTxtTemp [{}]", smsTxtTemp);
|
| 281 | 280 |
// log.info(" + placeholder [{}]", placeholder);
|
| 282 | 281 |
// log.info(" + value [{}]", value);
|
--- src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java
+++ src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java
... | ... | @@ -498,7 +498,6 @@ |
| 498 | 498 |
* 발송관리 엑셀다운로드 기능 - 카카오톡 |
| 499 | 499 |
* @param searchVO |
| 500 | 500 |
* @param model |
| 501 |
- * @return "/web/mjon/msgsent/msgSentExcelDownLoadAjax.do" |
|
| 502 | 501 |
* @throws Exception |
| 503 | 502 |
*/ |
| 504 | 503 |
@RequestMapping(value= {"/web/mjon/msgsent/kakaoSentExcelDownLoadAjax.do"})
|
--- src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataVO.java
+++ src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataVO.java
... | ... | @@ -28,6 +28,7 @@ |
| 28 | 28 |
private List msgIdList; |
| 29 | 29 |
private List msgSeqList; |
| 30 | 30 |
private String subject; |
| 31 |
+ private String subjectChkYn; |
|
| 31 | 32 |
private String mmsSubject; |
| 32 | 33 |
private String smsTxt; |
| 33 | 34 |
private String smsLen; |
--- src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
+++ src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
... | ... | @@ -5963,7 +5963,6 @@ |
| 5963 | 5963 |
* 발송관리 엑셀다운로드 기능 |
| 5964 | 5964 |
* @param searchVO |
| 5965 | 5965 |
* @param model |
| 5966 |
- * @return "/web/mjon/msgsent/msgSentExcelDownLoadAjax.do" |
|
| 5967 | 5966 |
* @throws Exception |
| 5968 | 5967 |
*/ |
| 5969 | 5968 |
@RequestMapping(value= {"/web/mjon/msgdata/recieveCallToListExcelDownAjax.do"})
|
--- src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java
+++ src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java
... | ... | @@ -25,6 +25,7 @@ |
| 25 | 25 |
private String userId; |
| 26 | 26 |
private String smsTxt; |
| 27 | 27 |
private String subject; |
| 28 |
+ private String subjectChkYn; |
|
| 28 | 29 |
private String msgType; |
| 29 | 30 |
private String fileCnt; |
| 30 | 31 |
private String msgKind; |
--- src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
+++ src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
... | ... | @@ -27,8 +27,8 @@ |
| 27 | 27 |
private String smsTxt; //문자 내용 |
| 28 | 28 |
private String subject; //문자 제목 |
| 29 | 29 |
private String subjectChkYn; //문자 제목 |
| 30 |
- private Date regdate; //문자 등록일자 |
|
| 31 |
- private Date reqdate; //문자 예약 발송 일자 |
|
| 30 |
+ private String regDate; //문자 등록일자 |
|
| 31 |
+ private String reqDate; //문자 예약 발송 일자 |
|
| 32 | 32 |
private String callFrom; //발신번호 |
| 33 | 33 |
private String callTo; //수신자 번호 |
| 34 | 34 |
private List callToList; //수신자 번호 리스트 |
--- src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java
+++ src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java
... | ... | @@ -13,8 +13,6 @@ |
| 13 | 13 |
import java.util.List; |
| 14 | 14 |
import java.util.Locale; |
| 15 | 15 |
import java.util.Map; |
| 16 |
-import java.util.regex.Matcher; |
|
| 17 |
-import java.util.regex.Pattern; |
|
| 18 | 16 |
|
| 19 | 17 |
import javax.annotation.Resource; |
| 20 | 18 |
import javax.servlet.http.HttpServletResponse; |
... | ... | @@ -24,7 +22,6 @@ |
| 24 | 22 |
import org.apache.poi.ss.usermodel.BorderStyle; |
| 25 | 23 |
import org.apache.poi.ss.usermodel.Cell; |
| 26 | 24 |
import org.apache.poi.ss.usermodel.CellStyle; |
| 27 |
-import org.apache.poi.ss.usermodel.FillPatternType; |
|
| 28 | 25 |
import org.apache.poi.ss.usermodel.Font; |
| 29 | 26 |
import org.apache.poi.ss.usermodel.HorizontalAlignment; |
| 30 | 27 |
import org.apache.poi.ss.usermodel.IndexedColors; |
... | ... | @@ -33,12 +30,11 @@ |
| 33 | 30 |
import org.apache.poi.ss.usermodel.VerticalAlignment; |
| 34 | 31 |
import org.apache.poi.ss.util.CellRangeAddress; |
| 35 | 32 |
import org.apache.poi.xssf.streaming.SXSSFWorkbook; |
| 36 |
-import org.apache.poi.xssf.usermodel.XSSFFont; |
|
| 37 |
-import org.apache.poi.xssf.usermodel.XSSFWorkbook; |
|
| 38 | 33 |
import org.springframework.stereotype.Service; |
| 39 | 34 |
|
| 40 | 35 |
import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; |
| 41 | 36 |
import egovframework.rte.fdl.idgnr.EgovIdGnrService; |
| 37 |
+import itn.com.cmm.util.StringUtil2; |
|
| 42 | 38 |
import itn.let.cmm.vo.FileInfoVO; |
| 43 | 39 |
import itn.let.fax.addr.service.FaxAddrGroupVO; |
| 44 | 40 |
import itn.let.mjo.addr.service.AddrGroupVO; |
... | ... | @@ -184,6 +180,8 @@ |
| 184 | 180 |
|
| 185 | 181 |
// 목록 |
| 186 | 182 |
MjonMsgDetailSentVO resultVO = mjonMsgSentDAO.selectAllMsgSentDetailView(mjonMsgDetailSentVO); |
| 183 |
+ |
|
| 184 |
+ log.info(" + :: [{}]", resultVO.getSmsTxt());
|
|
| 187 | 185 |
|
| 188 | 186 |
|
| 189 | 187 |
// 성공 대기 실패 발송금액 분할여부 |
... | ... | @@ -479,6 +477,9 @@ |
| 479 | 477 |
public List<MjonMsgDetailSentVO> findByMsgDetailListAjax(MjonMsgDetailSentVO mjonMsgDetailSentVO) {
|
| 480 | 478 |
|
| 481 | 479 |
List<MjonMsgDetailSentVO> list = mjonMsgSentDAO.findByMsgDetailListAjax(mjonMsgDetailSentVO); |
| 480 |
+ list.stream().forEach(t->{
|
|
| 481 |
+ t.setCallTo(StringUtil2.formatPhone(t.getCallTo())); |
|
| 482 |
+ }); |
|
| 482 | 483 |
|
| 483 | 484 |
return list; |
| 484 | 485 |
} |
... | ... | @@ -628,8 +629,14 @@ |
| 628 | 629 |
|
| 629 | 630 |
for (int i = 0; i < resultAllSentList.size(); i++) {
|
| 630 | 631 |
MjonMsgSentVO vo = resultAllSentList.get(i); |
| 631 |
- data[i][0] = i; |
|
| 632 |
- data[i][1] = vo.getReqdate(); |
|
| 632 |
+ data[i][0] = i+1; |
|
| 633 |
+ data[i][1] = vo.getReqDate(); |
|
| 634 |
+// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
| 635 |
+// data[i][1] = sdf.format(vo.getReqDate()); |
|
| 636 |
+ |
|
| 637 |
+ |
|
| 638 |
+ log.info("엑셀에 넣을 데이터: [{}]", data[i][1]);
|
|
| 639 |
+ |
|
| 633 | 640 |
data[i][2] = "H".equals(vo.getSendKind()) ? "WEB" : "API"; |
| 634 | 641 |
|
| 635 | 642 |
String msgType="단문"; |
--- src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java
+++ src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java
... | ... | @@ -247,12 +247,16 @@ |
| 247 | 247 |
//* SEND_KIND = "H" |
| 248 | 248 |
|
| 249 | 249 |
// 전체 영역 |
| 250 |
- model.addAttribute("H_allSentCntVO", this.getResultCntProc(H_smsMsgCnt));
|
|
| 250 |
+ log.info("all");
|
|
| 251 |
+ model.addAttribute("H_allSentCntVO", this.getResultCntProc(totalMsgCnt));
|
|
| 251 | 252 |
// 전체 단문(SMS) |
| 253 |
+ log.info("sms");
|
|
| 252 | 254 |
model.addAttribute("H_smsSentCntVO", this.getResultCntProc(H_smsMsgCnt));
|
| 253 | 255 |
// 전체 장문(LMS) |
| 256 |
+ log.info("lms");
|
|
| 254 | 257 |
model.addAttribute("H_lmsSentCntVO", this.getResultCntProc(H_lmsMsgCnt));
|
| 255 |
- // 전체 장문(LMS) |
|
| 258 |
+ // 전체 그림(MMS) |
|
| 259 |
+ log.info("mms");
|
|
| 256 | 260 |
model.addAttribute("H_mmsSentCntVO", this.getResultCntProc(H_mmsMsgCnt));
|
| 257 | 261 |
|
| 258 | 262 |
|
... | ... | @@ -283,14 +287,17 @@ |
| 283 | 287 |
cntVO.setWaitCnt(msgCnt.stream() |
| 284 | 288 |
.filter(f->"W".equals(f.getMsgResultSts())) |
| 285 | 289 |
.mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum()); |
| 290 |
+ log.info(" :: cntVO.getWaitCnt() :: [{}]", cntVO.getWaitCnt());
|
|
| 286 | 291 |
// 전체 성공 갯수 |
| 287 | 292 |
cntVO.setSuccCnt(msgCnt.stream() |
| 288 | 293 |
.filter(f->"S".equals(f.getMsgResultSts())) |
| 289 | 294 |
.mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum()); |
| 295 |
+ log.info(" :: cntVO.getSuccCnt() :: [{}]", cntVO.getSuccCnt());
|
|
| 290 | 296 |
// 전체 실패 갯수 |
| 291 | 297 |
cntVO.setFailCnt(msgCnt.stream() |
| 292 | 298 |
.filter(f->"F".equals(f.getMsgResultSts())) |
| 293 | 299 |
.mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum()); |
| 300 |
+ log.info(" :: cntVO.getFailCnt() :: [{}]", cntVO.getFailCnt());
|
|
| 294 | 301 |
|
| 295 | 302 |
// 전체 갯수 구하기 |
| 296 | 303 |
cntVO.setTotCnt(cntVO.getWaitCnt() + cntVO.getSuccCnt() + cntVO.getFailCnt()); |
... | ... | @@ -314,6 +321,7 @@ |
| 314 | 321 |
|
| 315 | 322 |
|
| 316 | 323 |
log.info(" ListView pageIndex :: [{}]", mjonMsgSentVO.getPageIndex());
|
| 324 |
+ log.info(" ListView pageUnit :: [{}]", mjonMsgSentVO.getPageUnit());
|
|
| 317 | 325 |
|
| 318 | 326 |
|
| 319 | 327 |
//로그인 권한정보 불러오기 |
--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
... | ... | @@ -371,6 +371,7 @@ |
| 371 | 371 |
, MD.FILE_PATH2 as filePath2 |
| 372 | 372 |
, MD.FILE_PATH3 as filePath3 |
| 373 | 373 |
, TIMESTAMPDIFF(minute, DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d %T'), DATE_FORMAT(NOW(), '%Y-%m-%d %T')) as diffMin |
| 374 |
+ , SUBJECT_CHK_YN as subjectChkYn |
|
| 374 | 375 |
from |
| 375 | 376 |
MJ_MSG_GROUP_DATA MGD |
| 376 | 377 |
inner join MJ_MSG_DATA MD on |
... | ... | @@ -429,8 +430,8 @@ |
| 429 | 430 |
, B.SMS_TXT as smsTxt |
| 430 | 431 |
, B.SUBJECT as subject |
| 431 | 432 |
, B.SUBJECT_CHK_YN as subjectChkYn |
| 432 |
- , DATE_FORMAT(B.REGDATE, '%Y-%m-%d %T') AS regdate |
|
| 433 |
- , DATE_FORMAT(B.REQ_DATE, '%Y-%m-%d %T') AS reqDate |
|
| 433 |
+ , CAST(DATE_FORMAT(B.REGDATE, '%Y-%m-%d %H:%i') AS CHAR) AS regDate |
|
| 434 |
+ , CAST(DATE_FORMAT(B.REQ_DATE, '%Y-%m-%d %H:%i') AS CHAR) AS reqDate |
|
| 434 | 435 |
, ( |
| 435 | 436 |
CASE |
| 436 | 437 |
WHEN B.DELAY_YN = 'Y' AND B.DELAY_COMPLETE_YN = 'N' THEN DATE_ADD(B.REQ_DATE, INTERVAL -30 MINUTE) |
... | ... | @@ -452,7 +453,7 @@ |
| 452 | 453 |
, B.DELAY_COMPLETE_YN as delayCompleteYn |
| 453 | 454 |
, B.RESERVE_YN as reserveYn |
| 454 | 455 |
, B.RESERVE_C_YN as reserveCYn |
| 455 |
- , TIMESTAMPDIFF(minute, DATE_FORMAT(B.REQ_DATE, '%Y-%m-%d %T'), DATE_FORMAT(NOW(), '%Y-%m-%d %T')) as diffMin |
|
| 456 |
+ , TIMESTAMPDIFF(minute, CAST(DATE_FORMAT(B.REQ_DATE, '%Y-%m-%d %H:%i') AS CHAR), DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i')) as diffMin |
|
| 456 | 457 |
FROM MJ_MSG_DATA A |
| 457 | 458 |
JOIN MJ_MSG_GROUP_DATA B ON A.MSG_GROUP_ID = B.MSG_GROUP_ID |
| 458 | 459 |
WHERE (B.DEL_FLAG = 'N' OR B.DEL_FLAG IS NULL) |
--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
... | ... | @@ -22,6 +22,7 @@ |
| 22 | 22 |
<%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %> |
| 23 | 23 |
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> |
| 24 | 24 |
<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%> |
| 25 |
+<%@ taglib prefix="fnc" uri="/WEB-INF/tld/functions.tld"%> |
|
| 25 | 26 |
<% pageContext.setAttribute("newLineChar", "\r\n"); %>
|
| 26 | 27 |
<% pageContext.setAttribute("newLineChar2", "\n"); %>
|
| 27 | 28 |
<% String serverName = request.getServerName(); %> |
... | ... | @@ -4157,8 +4158,10 @@ |
| 4157 | 4158 |
</td> |
| 4158 | 4159 |
<td> |
| 4159 | 4160 |
<c:choose> |
| 4160 |
- <c:when test="${not empty mjonMsgSentList.regdate}">
|
|
| 4161 |
- <fmt:formatDate value="${mjonMsgSentList.regdate}" pattern="MM-dd HH:mm"/>
|
|
| 4161 |
+ <c:when test="${not empty mjonMsgSentList.regDate}">
|
|
| 4162 |
+<%-- <fmt:formatDate value="${mjonMsgSentList.regDate}" pattern="MM-dd HH:mm"/> --%>
|
|
| 4163 |
+ ${fnc:setStrToDataFormatter(mjonMsgSentList.regDate, 'MM-dd HH:mm') }
|
|
| 4164 |
+<%-- <c:out value="${mjonMsgSentList.regDate}" /> --%>
|
|
| 4162 | 4165 |
</c:when> |
| 4163 | 4166 |
<c:otherwise> |
| 4164 | 4167 |
- |
... | ... | @@ -4367,8 +4370,11 @@ |
| 4367 | 4370 |
</td> |
| 4368 | 4371 |
<td> |
| 4369 | 4372 |
<c:choose> |
| 4370 |
- <c:when test="${not empty mjonMsgSentList.regdate}">
|
|
| 4371 |
- <fmt:formatDate value="${mjonMsgSentList.regdate}" pattern="MM-dd HH:mm"/>
|
|
| 4373 |
+ <c:when test="${not empty mjonMsgSentList.regDate}">
|
|
| 4374 |
+<%-- <fmt:formatDate value="${mjonMsgSentList.regDate}" pattern="MM-dd HH:mm"/> --%>
|
|
| 4375 |
+<%-- <c:out value="${mjonMsgSentList.regDate}" /> --%>
|
|
| 4376 |
+ |
|
| 4377 |
+ ${fnc:setStrToDataFormatter(mjonMsgSentList.regDate, 'MM-dd HH:mm') }
|
|
| 4372 | 4378 |
</c:when> |
| 4373 | 4379 |
<c:otherwise> |
| 4374 | 4380 |
- |
... | ... | @@ -4586,8 +4592,8 @@ |
| 4586 | 4592 |
</td> |
| 4587 | 4593 |
<td> |
| 4588 | 4594 |
<c:choose> |
| 4589 |
- <c:when test="${not empty mjonMsgDelaySentList.regdate}">
|
|
| 4590 |
- <fmt:formatDate value="${mjonMsgDelaySentList.regdate}" pattern="yyyy-MM-dd HH:mm"/>
|
|
| 4595 |
+ <c:when test="${not empty mjonMsgDelaySentList.regDate}">
|
|
| 4596 |
+ <fmt:formatDate value="${mjonMsgDelaySentList.regDate}" pattern="yyyy-MM-dd HH:mm"/>
|
|
| 4591 | 4597 |
</c:when> |
| 4592 | 4598 |
<c:otherwise> |
| 4593 | 4599 |
- |
... | ... | @@ -4785,6 +4791,10 @@ |
| 4785 | 4791 |
<td> |
| 4786 | 4792 |
<c:choose> |
| 4787 | 4793 |
<c:when test="${not empty kakaoResultList.regDate}">
|
| 4794 |
+ |
|
| 4795 |
+ <c:out value="${kakaoResultList.regDate}" />
|
|
| 4796 |
+ |
|
| 4797 |
+<%-- ${fnc:setStrToDataFormatter(kakaoResultList.regDate, 'MM-dd HH:mm') } --%>
|
|
| 4788 | 4798 |
<fmt:parseDate value="${kakaoResultList.regDate}" var="dateValue" pattern="yyyy-MM-dd HH:mm:ss"/>
|
| 4789 | 4799 |
<fmt:formatDate value="${dateValue}" pattern="MM-dd HH:mm"/>
|
| 4790 | 4800 |
</c:when> |
... | ... | @@ -4925,8 +4935,10 @@ |
| 4925 | 4935 |
<td> |
| 4926 | 4936 |
<c:choose> |
| 4927 | 4937 |
<c:when test="${not empty kakaoReserveList.regDate}">
|
| 4928 |
- <fmt:parseDate value="${kakaoReserveList.regDate}" var="dateValue" pattern="yyyy-MM-dd HH:mm:ss"/>
|
|
| 4929 |
- <fmt:formatDate value="${dateValue}" pattern="MM-dd HH:mm"/>
|
|
| 4938 |
+ <c:out value="${kakaoReserveList.regDate}" />
|
|
| 4939 |
+ ${fnc:setStrToDataFormatter(kakaoReserveList.regDate, 'MM-dd HH:mm') }
|
|
| 4940 |
+<%-- <fmt:parseDate value="${kakaoReserveList.regDate}" var="dateValue" pattern="yyyy-MM-dd HH:mm:ss"/> --%>
|
|
| 4941 |
+<%-- <fmt:formatDate value="${dateValue}" pattern="MM-dd HH:mm"/> --%>
|
|
| 4930 | 4942 |
|
| 4931 | 4943 |
</c:when> |
| 4932 | 4944 |
<c:otherwise> |
... | ... | @@ -5073,8 +5085,11 @@ |
| 5073 | 5085 |
<td> |
| 5074 | 5086 |
<c:choose> |
| 5075 | 5087 |
<c:when test="${not empty kakaoDelayInfo.regDate}">
|
| 5076 |
- <fmt:parseDate value="${kakaoDelayInfo.regDate}" var="kakaoDelayRegdate" pattern="yyyy-MM-dd HH:mm:ss"/>
|
|
| 5077 |
- <fmt:formatDate value="${kakaoDelayRegdate}" pattern="MM-dd HH:mm"/>
|
|
| 5088 |
+<%-- <c:out value="${kakaoDelayInfo.regDate}" /> --%>
|
|
| 5089 |
+ ${fnc:setStrToDataFormatter(kakaoDelayInfo.regDate, 'MM-dd HH:mm') }
|
|
| 5090 |
+<%-- <fmt:formatDate value="${kakaoDelayRegdate}" pattern="MM-dd HH:mm"/> --%>
|
|
| 5091 |
+<%-- <fmt:parseDate value="${kakaoDelayInfo.regDate}" var="kakaoDelayRegdate" pattern="yyyy-MM-dd HH:mm:ss"/> --%>
|
|
| 5092 |
+<%-- <fmt:formatDate value="${kakaoDelayRegdate}" pattern="MM-dd HH:mm"/> --%>
|
|
| 5078 | 5093 |
</c:when> |
| 5079 | 5094 |
<c:otherwise> |
| 5080 | 5095 |
- |
--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
... | ... | @@ -3985,6 +3985,8 @@ |
| 3985 | 3985 |
</c:otherwise> |
| 3986 | 3986 |
</c:choose> |
| 3987 | 3987 |
</h2> |
| 3988 |
+ <!-- /web/mjon/msgdata/selectMsgDataSMLViewAjax.do --> |
|
| 3989 |
+ <!-- MsgDataSMLView.jsp --> |
|
| 3988 | 3990 |
<button type="button" class="button info" onclick="infoPop('selectMsgDataView1');">사용안내</button>
|
| 3989 | 3991 |
</div> |
| 3990 | 3992 |
<div class="send_general"> |
--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp
... | ... | @@ -123,18 +123,18 @@ |
| 123 | 123 |
</div> |
| 124 | 124 |
</div> |
| 125 | 125 |
</div> |
| 126 |
- <div class="inner"> |
|
| 127 |
- <!-- send top --> |
|
| 128 |
- <div class="send_top"> |
|
| 129 |
- <!-- tab button --> |
|
| 130 |
- <ul class="tabType1"> |
|
| 131 |
- <li class="tab ${tabDision eq 'tab01' ? 'active' : ''}">
|
|
| 132 |
- <button type="button" onclick="javascript:fnMsgDataView(); return false;">일반문자</button> |
|
| 133 |
- </li> |
|
| 134 |
- <li class="tab ${tabDision eq 'tab02' ? 'active' : ''}">
|
|
| 135 |
- <button type="button" onclick="javascript:fnMsgExcelDataView(); return false;">대량문자(광고문자)</button> |
|
| 136 |
- </li> |
|
| 137 |
- </ul><!--// tab button --> |
|
| 126 |
+ <div class="inner"> |
|
| 127 |
+ <!-- send top --> |
|
| 128 |
+ <div class="send_top"> |
|
| 129 |
+ <!-- tab button --> |
|
| 130 |
+ <ul class="tabType1"> |
|
| 131 |
+ <li class="tab ${tabDision eq 'tab01' ? 'active' : ''}">
|
|
| 132 |
+ <button type="button" onclick="javascript:fnMsgDataView(); return false;">일반문자</button> |
|
| 133 |
+ </li> |
|
| 134 |
+ <li class="tab ${tabDision eq 'tab02' ? 'active' : ''}">
|
|
| 135 |
+ <button type="button" onclick="javascript:fnMsgExcelDataView(); return false;">대량문자(광고문자)</button> |
|
| 136 |
+ </li> |
|
| 137 |
+ </ul><!--// tab button --> |
|
| 138 | 138 |
<!-- tab content1 --> |
| 139 | 139 |
<!-- <span id="contentArea"></span> --> |
| 140 | 140 |
<div class="top_content ${tabDision eq 'tab02' ? 'get_excel' : ''} current contentArea" id="tab1_1" style="min-height: 555px;"></div>
|
--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
... | ... | @@ -151,7 +151,7 @@ |
| 151 | 151 |
<div> |
| 152 | 152 |
<p class="cf_text c_e40000">※ 예약문자 발송취소는 예약 발송시간 기준 5분 전까지만 가능</p> |
| 153 | 153 |
<label for="pageUnit" class="label">줄보기 선택</label> |
| 154 |
- <select id="pageUnit" name="pageUnit" class="selType2"> |
|
| 154 |
+ <select id="pageUnitS" class="selType2"> |
|
| 155 | 155 |
<option value="10" <c:if test="${paginationInfo.recordCountPerPage == '10'}">selected</c:if> >10개보기</option>
|
| 156 | 156 |
<option value="20" <c:if test="${paginationInfo.recordCountPerPage == '20'}">selected</c:if> >20개보기</option>
|
| 157 | 157 |
<option value="30" <c:if test="${paginationInfo.recordCountPerPage == '30'}">selected</c:if> >30개보기</option>
|
... | ... | @@ -236,16 +236,16 @@ |
| 236 | 236 |
발송 대기 상태일 때만 원래 발송시간을 보여주고, 발송이 완료되면 발송 처리 완료 시간(reqDate)을 보여준다. |
| 237 | 237 |
30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 |
| 238 | 238 |
--%> |
| 239 |
- <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${result.delayOrgTime}" /></p>
|
|
| 239 |
+ <p>${result.delayOrgTime}</p>
|
|
| 240 | 240 |
</c:when> |
| 241 | 241 |
<c:otherwise> |
| 242 |
- <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${result.reqdate}" /></p>
|
|
| 242 |
+ <p>${result.reqDate}</p>
|
|
| 243 | 243 |
</c:otherwise> |
| 244 | 244 |
</c:choose> |
| 245 | 245 |
|
| 246 | 246 |
</c:when> |
| 247 | 247 |
<c:otherwise> |
| 248 |
- <p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${result.reqdate}" /></p>
|
|
| 248 |
+ <p>${result.reqDate}</p>
|
|
| 249 | 249 |
|
| 250 | 250 |
</c:otherwise> |
| 251 | 251 |
</c:choose> |
... | ... | @@ -343,7 +343,7 @@ |
| 343 | 343 |
<%-- <button type="button" class="btnType btnType15" onClick="javascript:fnAddBlockNo('${mjonMsgSentVO.listType}'); return false;"></i>수신거부번호 등록</button> --%>
|
| 344 | 344 |
</div> |
| 345 | 345 |
<div class="table_btn_right"> |
| 346 |
- <button type="button" class="excel_btn btnType" onClick="javascript:fnExcelDownLoad(); return false;"><i class="downroad"></i>엑셀 다운로드</button> |
|
| 346 |
+ <button type="button" class="excel_btn btnType" onClick="javascript:fnExcelDownLoad(); return false;"><i class="downroad"></i>발송결과 리스트</button> |
|
| 347 | 347 |
<%-- <button type="button" class="print_btn btnType" onClick="javascript:fnShowPrintPopup('all','${mjonMsgSentVO.tabType}'); return false;"><i class="print_img"></i>발송결과 출력하기</button> --%>
|
| 348 | 348 |
</div> |
| 349 | 349 |
</div> |
--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp
... | ... | @@ -4,7 +4,10 @@ |
| 4 | 4 |
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> |
| 5 | 5 |
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> |
| 6 | 6 |
<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%> |
| 7 |
+<%@ taglib prefix="fnc" uri="/WEB-INF/tld/functions.tld"%> |
|
| 8 |
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> |
|
| 7 | 9 |
<%@ page import="itn.com.cmm.LoginVO" %> |
| 10 |
+<% pageContext.setAttribute("newLineChar", "\n"); %>
|
|
| 8 | 11 |
|
| 9 | 12 |
|
| 10 | 13 |
|
... | ... | @@ -378,7 +381,7 @@ |
| 378 | 381 |
// 치환문자 포함 여부에 따른 분기 |
| 379 | 382 |
var msg = ""; |
| 380 | 383 |
if (replaceYn) {
|
| 381 |
- msg = "문자 내용에 포함된 특정 문구가 변환되지 않은 상태([*이름*],[*1*] 등)로 표기됩니다.\n문자내용, 받는 사람 목록 확인 후 발송해주세요"; |
|
| 384 |
+ msg = "문자발송 화면으로 이동합니다. 특정문구는 변환되지 않은 상태([*이름*],[*1*] 등)로 표기됩니다.\n문자내용, 받는 사람 목록 확인 후 발송해 주세요"; |
|
| 382 | 385 |
// form.msgResendAllReplaceYn.value = "Y"; |
| 383 | 386 |
} else {
|
| 384 | 387 |
var title = (msgKind == 'C') ? "선거문자발송" : "문자발송"; |
... | ... | @@ -543,7 +546,7 @@ |
| 543 | 546 |
}; |
| 544 | 547 |
|
| 545 | 548 |
let selectedTab = $(".tabType3 .tab.active button").text().trim();
|
| 546 |
- if(!confirm(selectedTab+" 명단의 번호를 주소록에서 삭제하시겠습니까?")){
|
|
| 549 |
+ if(!confirm("발송"+selectedTab+" 번호를 주소록에서 삭제하시겠습니까?\n(모든 주소록 그룹에서 삭제)")){
|
|
| 547 | 550 |
return false; |
| 548 | 551 |
} |
| 549 | 552 |
|
... | ... | @@ -666,11 +669,11 @@ |
| 666 | 669 |
<dd>${result.regDate }</dd>
|
| 667 | 670 |
</dl> |
| 668 | 671 |
</c:if> |
| 669 |
- <c:if test="${not empty result.subject }">
|
|
| 670 |
- <dl> |
|
| 671 |
- <dt>제목</dt> |
|
| 672 |
- <dd>${result.subject }</dd>
|
|
| 673 |
- </dl> |
|
| 672 |
+ <c:if test="${result.subjectChkYn eq 'Y'}">
|
|
| 673 |
+ <dl> |
|
| 674 |
+ <dt>제목</dt> |
|
| 675 |
+ <dd>${result.subject }</dd>
|
|
| 676 |
+ </dl> |
|
| 674 | 677 |
</c:if> |
| 675 | 678 |
<dl> |
| 676 | 679 |
<dt>형태</dt> |
... | ... | @@ -688,7 +691,8 @@ |
| 688 | 691 |
</dl> |
| 689 | 692 |
<dl> |
| 690 | 693 |
<dt>발신번호</dt> |
| 691 |
- <dd>${result.callFrom }</dd>
|
|
| 694 |
+<%-- <dd>${result.callFrom }</dd> --%>
|
|
| 695 |
+ <dd>${fnc:formatPhone(result.callFrom) }</dd>
|
|
| 692 | 696 |
</dl> |
| 693 | 697 |
<dl> |
| 694 | 698 |
<dt>진행상황 |
... | ... | @@ -733,7 +737,18 @@ |
| 733 | 737 |
<div class="res_info_btm"> |
| 734 | 738 |
<dl> |
| 735 | 739 |
<dt class="btm_charge">발송요금</dt> |
| 736 |
- <dd><span class="stcharge">78,100</span>원</dd> |
|
| 740 |
+ <dd> |
|
| 741 |
+ <span class="stcharge"> |
|
| 742 |
+ <c:choose> |
|
| 743 |
+ <c:when test="${result.totPrice eq '-' }">
|
|
| 744 |
+ 0 |
|
| 745 |
+ </c:when> |
|
| 746 |
+ <c:otherwise> |
|
| 747 |
+ <fmt:formatNumber value="${result.totPrice }" type="number" groupingUsed="true" minFractionDigits="0" maxFractionDigits="1" />
|
|
| 748 |
+ </c:otherwise> |
|
| 749 |
+ </c:choose> |
|
| 750 |
+ </span>원 |
|
| 751 |
+ </dd> |
|
| 737 | 752 |
<!--<dd><span class="stcharge">-</span>원</dd>--><!-- 예역취소 후 금액은 하이픈 처리--> |
| 738 | 753 |
</dl> |
| 739 | 754 |
</div> |
... | ... | @@ -843,7 +858,9 @@ |
| 843 | 858 |
<c:if test="${result.msgKind eq 'A' }" >
|
| 844 | 859 |
<p class="ad_tit">(광고)</p> |
| 845 | 860 |
</c:if> |
| 846 |
- <p class="none_txt" id="smsTxt"><c:out value="${result.smsTxt }" /></p>
|
|
| 861 |
+ <p class="none_txt" id="smsTxt"> |
|
| 862 |
+ ${fn:replace(result.smsTxt, newLineChar, "<br/>")}
|
|
| 863 |
+ </p> |
|
| 847 | 864 |
<p class="realtime"></p> |
| 848 | 865 |
<c:if test="${result.msgKind eq 'A' }" >
|
| 849 | 866 |
<p class="deny_receipt">무료 거부 080-0000-0000</p> |
... | ... | @@ -924,31 +941,6 @@ |
| 924 | 941 |
</div> |
| 925 | 942 |
</div> |
| 926 | 943 |
<!-- //발송대상 리스트 안내 팝업 --> |
| 927 |
- <!-- |
|
| 928 |
- <div class="tooltip-wrap"> |
|
| 929 |
- <div class="popup-com adr_layer rev_popup02" tabindex="0" data-tooltip-con="rev_popup02" data-focus="rev_popup02" data-focus-prev="rev_popup02-close" style="width: 500px;"> |
|
| 930 |
- <div class="popup_heading"> |
|
| 931 |
- <p>그룹등록</p> |
|
| 932 |
- <button type="button" class="tooltip-close grpClose" data-focus="rev_popup02-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
|
| 933 |
- </div> |
|
| 934 |
- <div class="layer_in"> |
|
| 935 |
- <div class="gorup_join_cont"> |
|
| 936 |
- <p class="adr_pop_title">선택된 발송내역 전화번호를 그룹으로 등록합니다.</p> |
|
| 937 |
- <div class="group_input" style="margin-top: 0;"> |
|
| 938 |
- <div class="input_left">그룹이름</div> |
|
| 939 |
- <div class="input_right"> |
|
| 940 |
- <label for="grpNm" class="label">새 그룹명 입력</label> |
|
| 941 |
- <input type="text" id="grpNm" name="grpNm" placeholder="새 그룹명 입력" onfocus="this.placeholder=''" onblur="this.placeholder='새 그룹명 입력'" class="inputLight"> |
|
| 942 |
- </div> |
|
| 943 |
- </div> |
|
| 944 |
- <div class="popup_btn_wrap2"> |
|
| 945 |
- <button type="button" onclick="javascript:fnAddAddrNo(); return false;">저장</button> |
|
| 946 |
- <button type="button" class="tooltip-close grpClose" data-focus="rev_popup02-close" data-focus-next="rev_popup02">취소</button> |
|
| 947 |
- </div> |
|
| 948 |
- </div> |
|
| 949 |
- </div> |
|
| 950 |
- </div> |
|
| 951 |
- </div> --> |
|
| 952 | 944 |
|
| 953 | 945 |
<!-- 주소록에 등록 팝업 --> |
| 954 | 946 |
<div class="tooltip-wrap"> |
--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp
... | ... | @@ -107,7 +107,8 @@ |
| 107 | 107 |
|
| 108 | 108 |
}); |
| 109 | 109 |
|
| 110 |
- $(document).on('change','#pageUnit', function(){
|
|
| 110 |
+ $(document).on('change','#pageUnitS', function(){
|
|
| 111 |
+ setPageUnit($(this).val()); |
|
| 111 | 112 |
|
| 112 | 113 |
linkPage(1); |
| 113 | 114 |
|
... | ... | @@ -116,6 +117,10 @@ |
| 116 | 117 |
subContent(); |
| 117 | 118 |
|
| 118 | 119 |
}); |
| 120 |
+ |
|
| 121 |
+function setPageUnit(val){
|
|
| 122 |
+ $('#pageUnit').val(val);
|
|
| 123 |
+} |
|
| 119 | 124 |
|
| 120 | 125 |
|
| 121 | 126 |
//탭 활성화 처리 함수 |
... | ... | @@ -198,7 +203,7 @@ |
| 198 | 203 |
|
| 199 | 204 |
//즉시, 예약 탭은 전체로 바꿔야함 |
| 200 | 205 |
fn_activateTab('');
|
| 201 |
- |
|
| 206 |
+ setPageUnit('10');
|
|
| 202 | 207 |
|
| 203 | 208 |
var form = document.searchForm; |
| 204 | 209 |
|
--- src/main/webapp/WEB-INF/jsp/web/msgsent/subcontent/MsgSentView_HA_allSentAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgsent/subcontent/MsgSentView_HA_allSentAjax.jsp
... | ... | @@ -28,7 +28,7 @@ |
| 28 | 28 |
<div class="rev_admin_in"> |
| 29 | 29 |
<div class="rev_admin_top clearfix"> |
| 30 | 30 |
<p>전체</p> |
| 31 |
- <c:set var="allTotal" value="${H_smsSentCntVO.totCnt + H_lmsSentCntVO.totCnt + H_mmsSentCntVO.totCnt}" />
|
|
| 31 |
+ <c:set var="allTotal" value="${H_allSentCntVO.totCnt}" />
|
|
| 32 | 32 |
<p><span><fmt:formatNumber value="${allTotal }" pattern="#,###"/></span> 건</p>
|
| 33 | 33 |
</div> |
| 34 | 34 |
<div class="rev_admin_btm"> |
... | ... | @@ -46,23 +46,6 @@ |
| 46 | 46 |
<dd><span class="c_e40000"><fmt:formatNumber value="${H_allSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
|
| 47 | 47 |
</dl> |
| 48 | 48 |
</div> |
| 49 |
- <%-- <c:if test="${appMgmt }">
|
|
| 50 |
- <div class="rev_admin_btm admin_btm admin_btm_api"> |
|
| 51 |
- <P class="title_top">API<span class="title_num"><fmt:formatNumber value="${A_allSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
|
|
| 52 |
- <dl> |
|
| 53 |
- <dt>대기</dt> |
|
| 54 |
- <dd><span class="c_002c9a"><fmt:formatNumber value="${A_allSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
|
|
| 55 |
- </dl> |
|
| 56 |
- <dl> |
|
| 57 |
- <dt>성공</dt> |
|
| 58 |
- <dd><span class="c_002c9a"><fmt:formatNumber value="${A_allSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
|
|
| 59 |
- </dl> |
|
| 60 |
- <dl> |
|
| 61 |
- <dt>실패</dt> |
|
| 62 |
- <dd><span class="c_e40000"><fmt:formatNumber value="${A_allSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
|
|
| 63 |
- </dl> |
|
| 64 |
- </div> |
|
| 65 |
- </c:if> --%> |
|
| 66 | 49 |
</div> |
| 67 | 50 |
<div class="rev_admin_in"> |
| 68 | 51 |
<div class="rev_admin_top clearfix"> |
... | ... | @@ -85,23 +68,6 @@ |
| 85 | 68 |
<dd><span class="c_e40000"><fmt:formatNumber value="${H_smsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
|
| 86 | 69 |
</dl> |
| 87 | 70 |
</div> |
| 88 |
- <%-- <c:if test="${appMgmt }">
|
|
| 89 |
- <div class="rev_admin_btm admin_btm admin_btm_api"> |
|
| 90 |
- <P class="title_top">API<span class="title_num"><fmt:formatNumber value="${A_smsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
|
|
| 91 |
- <dl> |
|
| 92 |
- <dt>대기</dt> |
|
| 93 |
- <dd><span class="c_002c9a"><fmt:formatNumber value="${A_smsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
|
|
| 94 |
- </dl> |
|
| 95 |
- <dl> |
|
| 96 |
- <dt>성공</dt> |
|
| 97 |
- <dd><span class="c_002c9a"><fmt:formatNumber value="${A_smsSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
|
|
| 98 |
- </dl> |
|
| 99 |
- <dl> |
|
| 100 |
- <dt>실패</dt> |
|
| 101 |
- <dd><span class="c_e40000"><fmt:formatNumber value="${A_smsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
|
|
| 102 |
- </dl> |
|
| 103 |
- </div> |
|
| 104 |
- </c:if> --%> |
|
| 105 | 71 |
</div> |
| 106 | 72 |
<div class="rev_admin_in"> |
| 107 | 73 |
<div class="rev_admin_top clearfix"> |
... | ... | @@ -124,23 +90,6 @@ |
| 124 | 90 |
<dd><span class="c_e40000"><fmt:formatNumber value="${H_lmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
|
| 125 | 91 |
</dl> |
| 126 | 92 |
</div> |
| 127 |
- <%-- <c:if test="${appMgmt }">
|
|
| 128 |
- <div class="rev_admin_btm admin_btm admin_btm_api"> |
|
| 129 |
- <P class="title_top">API<span class="title_num"><fmt:formatNumber value="${A_lmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
|
|
| 130 |
- <dl> |
|
| 131 |
- <dt>대기</dt> |
|
| 132 |
- <dd><span class="c_002c9a"><fmt:formatNumber value="${A_lmsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
|
|
| 133 |
- </dl> |
|
| 134 |
- <dl> |
|
| 135 |
- <dt>성공</dt> |
|
| 136 |
- <dd><span class="c_002c9a"><fmt:formatNumber value="${A_lmsSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
|
|
| 137 |
- </dl> |
|
| 138 |
- <dl> |
|
| 139 |
- <dt>실패</dt> |
|
| 140 |
- <dd><span class="c_e40000"><fmt:formatNumber value="${A_lmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
|
|
| 141 |
- </dl> |
|
| 142 |
- </div> |
|
| 143 |
- </c:if> --%> |
|
| 144 | 93 |
</div> |
| 145 | 94 |
<div class="rev_admin_in"> |
| 146 | 95 |
<div class="rev_admin_top clearfix"> |
... | ... | @@ -163,21 +112,4 @@ |
| 163 | 112 |
<dd><span class="c_e40000"><fmt:formatNumber value="${H_mmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
|
| 164 | 113 |
</dl> |
| 165 | 114 |
</div> |
| 166 |
- <%-- <c:if test="${appMgmt }">
|
|
| 167 |
- <div class="rev_admin_btm admin_btm admin_btm_api"> |
|
| 168 |
- <P class="title_top">API<span class="title_num"><fmt:formatNumber value="${A_mmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
|
|
| 169 |
- <dl> |
|
| 170 |
- <dt>대기</dt> |
|
| 171 |
- <dd><span class="c_002c9a"><fmt:formatNumber value="${A_mmsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
|
|
| 172 |
- </dl> |
|
| 173 |
- <dl> |
|
| 174 |
- <dt>성공</dt> |
|
| 175 |
- <dd><span class="c_002c9a"><fmt:formatNumber value="${A_mmsSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
|
|
| 176 |
- </dl> |
|
| 177 |
- <dl> |
|
| 178 |
- <dt>실패</dt> |
|
| 179 |
- <dd><span class="c_e40000"><fmt:formatNumber value="${A_mmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
|
|
| 180 |
- </dl> |
|
| 181 |
- </div> |
|
| 182 |
- </c:if> --%> |
|
| 183 | 115 |
</div>(No newline at end of file) |
--- src/main/webapp/WEB-INF/tld/functions.tld
+++ src/main/webapp/WEB-INF/tld/functions.tld
... | ... | @@ -8,11 +8,17 @@ |
| 8 | 8 |
|
| 9 | 9 |
<!-- PhoneFormatUtil 클래스의 함수 --> |
| 10 | 10 |
<function> |
| 11 |
- <name>formatPhone</name> <!-- 호출 함수명 --> |
|
| 12 |
- <function-class>itn.com.cmm.util.StringUtil2</function-class> <!-- 참조 클레스 --> |
|
| 13 |
- <function-signature>java.lang.String formatPhone(java.lang.String)</function-signature> <!-- 참조 매소드의 파라미터 설정 --> |
|
| 11 |
+ <name>formatPhone</name> <!-- JSP에서 호출할 함수명 --> |
|
| 12 |
+ <function-class>itn.com.cmm.util.StringUtil2</function-class> <!-- 해당 함수를 포함하는 Java 클래스 --> |
|
| 13 |
+ <function-signature>java.lang.String formatPhone(java.lang.String)</function-signature> <!-- 함수의 반환 타입 및 매개변수 타입 (메서드 시그니처) --> |
|
| 14 | 14 |
</function> |
| 15 |
- |
|
| 15 |
+ |
|
| 16 |
+ <function> |
|
| 17 |
+ <name>setStrToDataFormatter</name> |
|
| 18 |
+ <function-class>itn.com.cmm.util.DateUtils</function-class> |
|
| 19 |
+ <function-signature>java.lang.String setStrToDataFormatter(java.lang.String, java.lang.String)</function-signature> |
|
| 20 |
+ </function> |
|
| 21 |
+ |
|
| 16 | 22 |
<!-- 예시) function 추가 - StringUtil 클래스의 함수 --> |
| 17 | 23 |
<!-- |
| 18 | 24 |
<function> |
--- src/main/webapp/js/web/msgdata/msgDataView.js
+++ src/main/webapp/js/web/msgdata/msgDataView.js
... | ... | @@ -13,6 +13,7 @@ |
| 13 | 13 |
|
| 14 | 14 |
// 문자 그룹정보 => 재전송용 |
| 15 | 15 |
function getMjMsgGroupInfoByResend() {
|
| 16 |
+ console.log('재전송 시 싱행되는 function');
|
|
| 16 | 17 |
$.ajax({
|
| 17 | 18 |
type: "POST", |
| 18 | 19 |
url: "/web/mjon/msgdata/selectMjMsgGroupInfoByResendAjax.do", |
... | ... | @@ -33,6 +34,7 @@ |
| 33 | 34 |
|
| 34 | 35 |
var smsTxt = msgData.smsTxt; |
| 35 | 36 |
var subject = msgData.subject; |
| 37 |
+ var subjectChkYn = msgData.subjectChkYn; |
|
| 36 | 38 |
var fileId = ""; |
| 37 | 39 |
var filePath = ""; |
| 38 | 40 |
var len = fileData.length; |
... | ... | @@ -56,11 +58,13 @@ |
| 56 | 58 |
console.log('msgData : ', msgData);
|
| 57 | 59 |
console.log('msgData : ', msgData);
|
| 58 | 60 |
// 문자제목 |
| 59 |
- if (msgData.subject != null && msgData.subject != "") {
|
|
| 60 |
- $('.msg_title').addClass('active');
|
|
| 61 |
- $("input:radio[name='subjectChkYn']:radio[value='Y']").prop('checked', true); // 선택하기
|
|
| 62 |
- $('.textbox').show();
|
|
| 63 |
- $("#mmsSubject").val(subject);
|
|
| 61 |
+ if (subject != null && subject != "") {
|
|
| 62 |
+ if(subjectChkYn == 'Y'){
|
|
| 63 |
+ $('.msg_title').addClass('active');
|
|
| 64 |
+ $("input:radio[name='subjectChkYn']:radio[value='Y']").prop('checked', true); // 선택하기
|
|
| 65 |
+ $('.textbox').show();
|
|
| 66 |
+ $("#mmsSubject").val(subject);
|
|
| 67 |
+ } |
|
| 64 | 68 |
} |
| 65 | 69 |
|
| 66 | 70 |
// 문자내용 |
... | ... | @@ -1280,10 +1284,8 @@ |
| 1280 | 1284 |
dataType: 'json', |
| 1281 | 1285 |
success: function (data) {
|
| 1282 | 1286 |
|
| 1283 |
- console.log('data : ', data);
|
|
| 1284 |
- |
|
| 1285 | 1287 |
var status = data.status; |
| 1286 |
- if("OK" == status){
|
|
| 1288 |
+ if("OK" == status){ // 성공
|
|
| 1287 | 1289 |
|
| 1288 | 1290 |
var smsCnt = Number(data.object.resultSts); |
| 1289 | 1291 |
var blockCnt = Number(data.object.resultBlockSts); |
... | ... | @@ -1309,19 +1311,19 @@ |
| 1309 | 1311 |
} |
| 1310 | 1312 |
|
| 1311 | 1313 |
|
| 1312 |
- }else if("BAD_REQUEST" == status){
|
|
| 1314 |
+ }else if("BAD_REQUEST" == status){ // 오류
|
|
| 1313 | 1315 |
|
| 1314 | 1316 |
alert(data.message); |
| 1315 | 1317 |
return false; |
| 1316 | 1318 |
|
| 1317 |
- }else if("UNAUTHORIZED" == status){
|
|
| 1319 |
+ }else if("UNAUTHORIZED" == status){ // 정지 회원 처리
|
|
| 1318 | 1320 |
|
| 1319 | 1321 |
alert(data.message); |
| 1320 | 1322 |
//문자발송 URL Move |
| 1321 | 1323 |
goMsgUrlMove(); |
| 1322 | 1324 |
return false; |
| 1323 | 1325 |
|
| 1324 |
- }else if("NO_CONTENT" == status){
|
|
| 1326 |
+ }else if("NO_CONTENT" == status){ // 발송로직에서 이미지 처리 오류 시 처리
|
|
| 1325 | 1327 |
|
| 1326 | 1328 |
$('.pop_msg_fails').css({'display':'block','opacity':'1','left':'50%','top':'50%','transform':'translate(-50%,-50%)'});
|
| 1327 | 1329 |
$('.pop_msg_fails .msg_text').html(returnData.message);
|
... | ... | @@ -1710,15 +1712,15 @@ |
| 1710 | 1712 |
|
| 1711 | 1713 |
function msgResultLink(){
|
| 1712 | 1714 |
var reserYn = $("input[name=reserYn]:checked").val(); // 예약 발송 여부 확인
|
| 1713 |
- if(reserYn == 'Y'){
|
|
| 1715 |
+ /*if(reserYn == 'Y'){
|
|
| 1714 | 1716 |
|
| 1715 | 1717 |
location.href="/web/mjon/reservmsg/selectReservMsgView.do"; |
| 1716 | 1718 |
|
| 1717 |
- }else{
|
|
| 1719 |
+ }else{*/
|
|
| 1718 | 1720 |
|
| 1719 | 1721 |
location.href="/web/mjon/msgsent/selectMsgSentView.do"; |
| 1720 | 1722 |
|
| 1721 |
- } |
|
| 1723 |
+ /*}*/ |
|
| 1722 | 1724 |
|
| 1723 | 1725 |
} |
| 1724 | 1726 |
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?