diff --git a/src/main/java/itn/com/cmm/util/DateUtils.java b/src/main/java/itn/com/cmm/util/DateUtils.java index 071236f1..98def430 100644 --- a/src/main/java/itn/com/cmm/util/DateUtils.java +++ b/src/main/java/itn/com/cmm/util/DateUtils.java @@ -194,7 +194,6 @@ public final class DateUtils { LocalDateTime dateTime = LocalDateTime.parse(str, inputFormatter); // 원하는 출력 포맷 적용 -// DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("MM-dd HH:mm"); DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern(formatter); String formattedDate = dateTime.format(outputFormatter); diff --git a/src/main/java/itn/com/cmm/util/MsgSendUtils.java b/src/main/java/itn/com/cmm/util/MsgSendUtils.java index 0fdc18b9..1801fd45 100644 --- a/src/main/java/itn/com/cmm/util/MsgSendUtils.java +++ b/src/main/java/itn/com/cmm/util/MsgSendUtils.java @@ -276,7 +276,6 @@ public final class MsgSendUtils { for (Map.Entry> entry : placeholders.entrySet()) { String placeholder = entry.getKey(); String value = entry.getValue().apply(sendVO); - System.out.println(""); // log.info(" + smsTxtTemp [{}]", smsTxtTemp); // log.info(" + placeholder [{}]", placeholder); // log.info(" + value [{}]", value); diff --git a/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java b/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java index 19d95a5e..ec57539a 100644 --- a/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java +++ b/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java @@ -498,7 +498,6 @@ public class KakaoSentController { * 발송관리 엑셀다운로드 기능 - 카카오톡 * @param searchVO * @param model - * @return "/web/mjon/msgsent/msgSentExcelDownLoadAjax.do" * @throws Exception */ @RequestMapping(value= {"/web/mjon/msgsent/kakaoSentExcelDownLoadAjax.do"}) diff --git a/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataVO.java b/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataVO.java index e4704a72..09d9aa28 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataVO.java +++ b/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataVO.java @@ -28,6 +28,7 @@ public class MjonMsgDataVO extends UserDefaultVO{ private List msgIdList; private List msgSeqList; private String subject; + private String subjectChkYn; private String mmsSubject; private String smsTxt; private String smsLen; diff --git a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java index 77e3c526..d4657e7a 100644 --- a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java +++ b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java @@ -5963,7 +5963,6 @@ public class MjonMsgDataController { * 발송관리 엑셀다운로드 기능 * @param searchVO * @param model - * @return "/web/mjon/msgsent/msgSentExcelDownLoadAjax.do" * @throws Exception */ @RequestMapping(value= {"/web/mjon/msgdata/recieveCallToListExcelDownAjax.do"}) diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java index 8e1a53ac..403de3c8 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java +++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java @@ -25,6 +25,7 @@ public class MjonMsgDetailSentVO extends UserDefaultVO{ private String userId; private String smsTxt; private String subject; + private String subjectChkYn; private String msgType; private String fileCnt; private String msgKind; diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java index af114ee2..1e412147 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java +++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java @@ -27,8 +27,8 @@ public class MjonMsgSentVO extends UserDefaultVO{ private String smsTxt; //문자 내용 private String subject; //문자 제목 private String subjectChkYn; //문자 제목 - private Date regdate; //문자 등록일자 - private Date reqdate; //문자 예약 발송 일자 + private String regDate; //문자 등록일자 + private String reqDate; //문자 예약 발송 일자 private String callFrom; //발신번호 private String callTo; //수신자 번호 private List callToList; //수신자 번호 리스트 diff --git a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java index ced8202c..15606a7e 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java @@ -13,8 +13,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -24,7 +22,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; -import org.apache.poi.ss.usermodel.FillPatternType; import org.apache.poi.ss.usermodel.Font; import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.IndexedColors; @@ -33,12 +30,11 @@ import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.VerticalAlignment; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.streaming.SXSSFWorkbook; -import org.apache.poi.xssf.usermodel.XSSFFont; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.stereotype.Service; import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import itn.com.cmm.util.StringUtil2; import itn.let.cmm.vo.FileInfoVO; import itn.let.fax.addr.service.FaxAddrGroupVO; import itn.let.mjo.addr.service.AddrGroupVO; @@ -185,6 +181,8 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements // 목록 MjonMsgDetailSentVO resultVO = mjonMsgSentDAO.selectAllMsgSentDetailView(mjonMsgDetailSentVO); + log.info(" + :: [{}]", resultVO.getSmsTxt()); + // 성공 대기 실패 발송금액 분할여부 MjonMsgSentVO updatedVO = getDetailFunction(resultVO.getMsgGroupId(), resultVO.getEachPrice()); @@ -479,6 +477,9 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements public List findByMsgDetailListAjax(MjonMsgDetailSentVO mjonMsgDetailSentVO) { List list = mjonMsgSentDAO.findByMsgDetailListAjax(mjonMsgDetailSentVO); + list.stream().forEach(t->{ + t.setCallTo(StringUtil2.formatPhone(t.getCallTo())); + }); return list; } @@ -628,8 +629,14 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements for (int i = 0; i < resultAllSentList.size(); i++) { MjonMsgSentVO vo = resultAllSentList.get(i); - data[i][0] = i; - data[i][1] = vo.getReqdate(); + data[i][0] = i+1; + data[i][1] = vo.getReqDate(); +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// data[i][1] = sdf.format(vo.getReqDate()); + + + log.info("엑셀에 넣을 데이터: [{}]", data[i][1]); + data[i][2] = "H".equals(vo.getSendKind()) ? "WEB" : "API"; String msgType="단문"; diff --git a/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java b/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java index 1f0213a8..c33fe418 100644 --- a/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java +++ b/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java @@ -247,12 +247,16 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll //* SEND_KIND = "H" // 전체 영역 - model.addAttribute("H_allSentCntVO", this.getResultCntProc(H_smsMsgCnt)); + log.info("all"); + model.addAttribute("H_allSentCntVO", this.getResultCntProc(totalMsgCnt)); // 전체 단문(SMS) + log.info("sms"); model.addAttribute("H_smsSentCntVO", this.getResultCntProc(H_smsMsgCnt)); // 전체 장문(LMS) + log.info("lms"); model.addAttribute("H_lmsSentCntVO", this.getResultCntProc(H_lmsMsgCnt)); - // 전체 장문(LMS) + // 전체 그림(MMS) + log.info("mms"); model.addAttribute("H_mmsSentCntVO", this.getResultCntProc(H_mmsMsgCnt)); @@ -283,14 +287,17 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll cntVO.setWaitCnt(msgCnt.stream() .filter(f->"W".equals(f.getMsgResultSts())) .mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum()); + log.info(" :: cntVO.getWaitCnt() :: [{}]", cntVO.getWaitCnt()); // 전체 성공 갯수 cntVO.setSuccCnt(msgCnt.stream() .filter(f->"S".equals(f.getMsgResultSts())) .mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum()); + log.info(" :: cntVO.getSuccCnt() :: [{}]", cntVO.getSuccCnt()); // 전체 실패 갯수 cntVO.setFailCnt(msgCnt.stream() .filter(f->"F".equals(f.getMsgResultSts())) .mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum()); + log.info(" :: cntVO.getFailCnt() :: [{}]", cntVO.getFailCnt()); // 전체 갯수 구하기 cntVO.setTotCnt(cntVO.getWaitCnt() + cntVO.getSuccCnt() + cntVO.getFailCnt()); @@ -314,6 +321,7 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll log.info(" ListView pageIndex :: [{}]", mjonMsgSentVO.getPageIndex()); + log.info(" ListView pageUnit :: [{}]", mjonMsgSentVO.getPageUnit()); //로그인 권한정보 불러오기 diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml index e2e0bfeb..49205e36 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml @@ -371,6 +371,7 @@ , MD.FILE_PATH2 as filePath2 , MD.FILE_PATH3 as filePath3 , TIMESTAMPDIFF(minute, DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d %T'), DATE_FORMAT(NOW(), '%Y-%m-%d %T')) as diffMin + , SUBJECT_CHK_YN as subjectChkYn from MJ_MSG_GROUP_DATA MGD inner join MJ_MSG_DATA MD on @@ -429,8 +430,8 @@ , B.SMS_TXT as smsTxt , B.SUBJECT as subject , B.SUBJECT_CHK_YN as subjectChkYn - , DATE_FORMAT(B.REGDATE, '%Y-%m-%d %T') AS regdate - , DATE_FORMAT(B.REQ_DATE, '%Y-%m-%d %T') AS reqDate + , CAST(DATE_FORMAT(B.REGDATE, '%Y-%m-%d %H:%i') AS CHAR) AS regDate + , CAST(DATE_FORMAT(B.REQ_DATE, '%Y-%m-%d %H:%i') AS CHAR) AS reqDate , ( CASE WHEN B.DELAY_YN = 'Y' AND B.DELAY_COMPLETE_YN = 'N' THEN DATE_ADD(B.REQ_DATE, INTERVAL -30 MINUTE) @@ -452,7 +453,7 @@ , B.DELAY_COMPLETE_YN as delayCompleteYn , B.RESERVE_YN as reserveYn , B.RESERVE_C_YN as reserveCYn - , TIMESTAMPDIFF(minute, DATE_FORMAT(B.REQ_DATE, '%Y-%m-%d %T'), DATE_FORMAT(NOW(), '%Y-%m-%d %T')) as diffMin + , 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 FROM MJ_MSG_DATA A JOIN MJ_MSG_GROUP_DATA B ON A.MSG_GROUP_ID = B.MSG_GROUP_ID WHERE (B.DEL_FLAG = 'N' OR B.DEL_FLAG IS NULL) diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp index e8aa3a6a..c70032c2 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp @@ -22,6 +22,7 @@ <%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%> +<%@ taglib prefix="fnc" uri="/WEB-INF/tld/functions.tld"%> <% pageContext.setAttribute("newLineChar", "\r\n"); %> <% pageContext.setAttribute("newLineChar2", "\n"); %> <% String serverName = request.getServerName(); %> @@ -4157,8 +4158,10 @@ function fnInputSmsTxt(){ - - + +<%-- --%> + ${fnc:setStrToDataFormatter(mjonMsgSentList.regDate, 'MM-dd HH:mm') } +<%-- --%> - @@ -4367,8 +4370,11 @@ function fnInputSmsTxt(){ - - + +<%-- --%> +<%-- --%> + + ${fnc:setStrToDataFormatter(mjonMsgSentList.regDate, 'MM-dd HH:mm') } - @@ -4586,8 +4592,8 @@ function fnInputSmsTxt(){ - - + + - @@ -4785,6 +4791,10 @@ function fnInputSmsTxt(){ + + + +<%-- ${fnc:setStrToDataFormatter(kakaoResultList.regDate, 'MM-dd HH:mm') } --%> @@ -4925,8 +4935,10 @@ function fnInputSmsTxt(){ - - + + ${fnc:setStrToDataFormatter(kakaoReserveList.regDate, 'MM-dd HH:mm') } +<%-- --%> +<%-- --%> @@ -5073,8 +5085,11 @@ function fnInputSmsTxt(){ - - +<%-- --%> + ${fnc:setStrToDataFormatter(kakaoDelayInfo.regDate, 'MM-dd HH:mm') } +<%-- --%> +<%-- --%> +<%-- --%> - diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp index e84faa17..7a789b56 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp @@ -3985,6 +3985,8 @@ function getMjMsgSentListAll(pageNo) { + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp index 7f41a177..10737a8c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp @@ -123,18 +123,18 @@ $(document).ready(function(){
-
- -
- -
    -
  • - -
    • -
  • - -
    • -
+
+ +
+ +
    +
  • + +
    • +
  • + +
    • +
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp index 0ce4a83b..8cfd15eb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp @@ -151,7 +151,7 @@ function fnReservCancel(msgGroupId){

※ 예약문자 발송취소는 예약 발송시간 기준 5분 전까지만 가능

- @@ -236,16 +236,16 @@ function fnReservCancel(msgGroupId){ 발송 대기 상태일 때만 원래 발송시간을 보여주고, 발송이 완료되면 발송 처리 완료 시간(reqDate)을 보여준다. 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 --%> -

+

${result.delayOrgTime}

-

+

${result.reqDate}

 -

+

${result.reqDate}

 @@ -343,7 +343,7 @@ function fnReservCancel(msgGroupId){ <%-- --%>
- + <%-- --%>
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp index 2179ea23..90450d51 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp @@ -4,7 +4,10 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%> +<%@ taglib prefix="fnc" uri="/WEB-INF/tld/functions.tld"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ page import="itn.com.cmm.LoginVO" %> +<% pageContext.setAttribute("newLineChar", "\n"); %> @@ -378,7 +381,7 @@ function fnMjMsgReSendAll(msgGroupId) { // 치환문자 포함 여부에 따른 분기 var msg = ""; if (replaceYn) { - msg = "문자 내용에 포함된 특정 문구가 변환되지 않은 상태([*이름*],[*1*] 등)로 표기됩니다.\n문자내용, 받는 사람 목록 확인 후 발송해주세요"; + msg = "문자발송 화면으로 이동합니다. 특정문구는 변환되지 않은 상태([*이름*],[*1*] 등)로 표기됩니다.\n문자내용, 받는 사람 목록 확인 후 발송해 주세요"; // form.msgResendAllReplaceYn.value = "Y"; } else { var title = (msgKind == 'C') ? "선거문자발송" : "문자발송"; @@ -543,7 +546,7 @@ function fnDelAddrNo(){ }; let selectedTab = $(".tabType3 .tab.active button").text().trim(); - if(!confirm(selectedTab+" 명단의 번호를 주소록에서 삭제하시겠습니까?")){ + if(!confirm("발송"+selectedTab+" 번호를 주소록에서 삭제하시겠습니까?\n(모든 주소록 그룹에서 삭제)")){ return false; } @@ -666,11 +669,11 @@ function getAddrGroupListShow(jsonList) {
${result.regDate }
- -
-
제목
-
${result.subject }
-
+ +
+
제목
+
${result.subject }
+
형태
@@ -688,7 +691,8 @@ function getAddrGroupListShow(jsonList) {
발신번호
-
${result.callFrom }
+<%--
${result.callFrom }
--%> +
${fnc:formatPhone(result.callFrom) }
진행상황 @@ -733,7 +737,18 @@ function getAddrGroupListShow(jsonList) {
발송요금
-
78,100원
+
+ + + + 0 + + + + + + 원 +
@@ -843,7 +858,9 @@ function getAddrGroupListShow(jsonList) {

(광고)

 -

+

+ ${fn:replace(result.smsTxt, newLineChar, "
")} +

무료 거부 080-0000-0000

@@ -924,31 +941,6 @@ function getAddrGroupListShow(jsonList) {
-
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp index 1e770571..457aed8f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp @@ -107,7 +107,8 @@ $(document).ready(function(){ }); - $(document).on('change','#pageUnit', function(){ + $(document).on('change','#pageUnitS', function(){ + setPageUnit($(this).val()); linkPage(1); @@ -117,6 +118,10 @@ $(document).ready(function(){ }); +function setPageUnit(val){ + $('#pageUnit').val(val); +} + //탭 활성화 처리 함수 function fn_activateTab(tabInfo) { @@ -198,7 +203,7 @@ function fnTabLoad(tabType){ //즉시, 예약 탭은 전체로 바꿔야함 fn_activateTab(''); - + setPageUnit('10'); var form = document.searchForm; diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/subcontent/MsgSentView_HA_allSentAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/subcontent/MsgSentView_HA_allSentAjax.jsp index 32d0ef40..45cbaccc 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/subcontent/MsgSentView_HA_allSentAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/subcontent/MsgSentView_HA_allSentAjax.jsp @@ -28,7 +28,7 @@ $(document).ready(function(){

전체

- +

건

@@ -46,23 +46,6 @@ $(document).ready(function(){
건
- <%-- -
-

API건

-
-
대기
-
건
-
-
-
성공
-
건
-
-
-
실패
-
건
-
-
- --%>
@@ -85,23 +68,6 @@ $(document).ready(function(){
건
- <%-- -
-

API건

-
-
대기
-
건
-
-
-
성공
-
건
-
-
-
실패
-
건
-
-
- --%>
@@ -124,23 +90,6 @@ $(document).ready(function(){
건
- <%-- -
-

API건

-
-
대기
-
건
-
-
-
성공
-
건
-
-
-
실패
-
건
-
-
- --%>
@@ -163,21 +112,4 @@ $(document).ready(function(){
건
- <%-- -
-

API건

-
-
대기
-
건
-
-
-
성공
-
건
-
-
-
실패
-
건
-
-
- --%>
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tld/functions.tld b/src/main/webapp/WEB-INF/tld/functions.tld index a858db46..9e335af5 100644 --- a/src/main/webapp/WEB-INF/tld/functions.tld +++ b/src/main/webapp/WEB-INF/tld/functions.tld @@ -8,11 +8,17 @@ - formatPhone - itn.com.cmm.util.StringUtil2 - java.lang.String formatPhone(java.lang.String) + formatPhone + itn.com.cmm.util.StringUtil2 + java.lang.String formatPhone(java.lang.String) - + + + setStrToDataFormatter + itn.com.cmm.util.DateUtils + java.lang.String setStrToDataFormatter(java.lang.String, java.lang.String) + +