diff --git a/src/main/java/itn/let/fax/user/service/impl/FaxDAO.java b/src/main/java/itn/let/fax/user/service/impl/FaxDAO.java index 71d2d3f6..0076acb4 100644 --- a/src/main/java/itn/let/fax/user/service/impl/FaxDAO.java +++ b/src/main/java/itn/let/fax/user/service/impl/FaxDAO.java @@ -90,6 +90,9 @@ public class FaxDAO extends EgovComAbstractDAO{ public List selectFaxSendList(FaxGroupDataVO faxGroupDataVO) { return (List) list("faxDAO.selectFaxSendList", faxGroupDataVO); } + public List selectFaxSendList_advc(FaxGroupDataVO faxGroupDataVO) { + return (List) list("faxDAO.selectFaxSendList_advc", faxGroupDataVO); + } public List selectFaxSendDetailList(FaxGroupDataVO faxGroupDataVO) { return (List) list("faxDAO.selectFaxSendDetailList", faxGroupDataVO); @@ -149,4 +152,5 @@ public class FaxDAO extends EgovComAbstractDAO{ public List selectMyFaxSendList(FaxGroupDataVO faxGroupDataVO) { return (List) list("faxDAO.selectMyFaxSendList", faxGroupDataVO); } + } \ No newline at end of file diff --git a/src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java b/src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java index 4ca8ef17..728f926d 100644 --- a/src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java +++ b/src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java @@ -254,7 +254,7 @@ public class FaxServiceImpl extends EgovAbstractServiceImpl implements FaxServic faxGroupDataVO.setLastIndex(paginationInfo.getLastRecordIndex()); faxGroupDataVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - List faxGroupListVO = faxDao.selectFaxSendList(faxGroupDataVO); + List faxGroupListVO = faxDao.selectFaxSendList_advc(faxGroupDataVO); paginationInfo.setTotalRecordCount(faxGroupListVO.size() > 0 ? faxGroupListVO.get(0).getTotCnt() : 0); resultMap.put("faxGroupListVO", faxGroupListVO); diff --git a/src/main/resources/egovframework/sqlmap/let/fax/Fax_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/fax/Fax_SQL_Mysql.xml index 2c0ee8fb..41fa3da8 100644 --- a/src/main/resources/egovframework/sqlmap/let/fax/Fax_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/fax/Fax_SQL_Mysql.xml @@ -286,6 +286,105 @@ LIMIT #recordCountPerPage# OFFSET #firstIndex# + + + + " /> diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/faxSendList_backup_advc_20240712.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/faxSendList_backup_advc_20240712.jsp new file mode 100644 index 00000000..08c3b041 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/fax/faxSendList_backup_advc_20240712.jsp @@ -0,0 +1,334 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ page import="itn.com.cmm.LoginVO" %> + + + + + + + + + + + + +<%-- --%> + + + +
+ +
+ +
+ +
+
+
+

팩스발송

+
+
+
    +
  • + +
    • +
  • + +
    • +
+
+ + +
+ + " /> + " /> + " /> +
+
+
+ 기간선택 +
+ + ~ + +
+ + + + +
+
+ + +
+ + + +
+
+
+
+
+ +
+
+ +

총 ${paginationInfo.totalRecordCount }건

+
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- --%> + +<%-- --%> + + + + + + + + + + + + + + + + + + + +
+ 제목 +
+ +
+ 		전송시간 +
+ +
+ 		문서매수 +
+ +
+ 		발송건수 +
+ +
+ 		발송결과 건수발송금액 +
+ +
+ 		환불금액 +
+ +
+
성공대기실패기타
${(searchVO.pageIndex* searchVO.pageUnit) - searchVO.pageUnit - i.index}${(searchVO.pageIndex* searchVO.pageUnit) - searchVO.pageUnit+i.index+1}${result.subject }${result.subject }${result.reqDate }${result.page }${result.totalEa } +

${result.sentEa }

+ 		+

${result.holdEa }

+ 		+

${result.errorEa }

+ 		+

${result.unSendEa }

+ 		+ + +

+
전송내역이 없습니다.
+
+
+
+
+
+ + +
+
+ +
    + +
+ +
+ + + +
+
+ +
+ + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp index fed19456..930800d1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp @@ -9,22 +9,31 @@ $(document).ready(function(){ }); + + function initMenuTab(){ var form = document.bizForm; $('.topTab').removeClass("active"); $("#smsTab").addClass("active"); - var siteId = '${siteId}'; - if(siteId == ''){ - siteId = form.siteId.value; - } +// var siteId = '${siteId}'; +// console.log('siteId : ', siteId); - if(siteId == 'tabSms'){ + + var uri = fn_G_getLastUrlSegment(); + + console.log('uri:', uri); + + + if(uri.includes('selectMsgSentView')){ $('.topTab').removeClass("active"); $("#smsTab").addClass("active"); - }else if(siteId == 'tabKakao'){ + }else if(uri.includes('selectKakaoSentView')){ $('.topTab').removeClass("active"); $("#kakaoTab").addClass("active"); + }else if(uri.includes('faxSendList')){ + $('.topTab').removeClass("active"); + $("#faxTab").addClass("active"); } } @@ -59,6 +68,6 @@ function fnLinkPageTab(tabInfo){
  • - +
    • \ No newline at end of file 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 28b0720d..4f0f19a2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp @@ -310,7 +310,7 @@ function fnExcelDownLoad(pageType, tabType){ else { if ($("#startDate").val() < prevMonth(3)) { alert("최근 3개월까지만 다운로드 가능합니다.") - return false; +// return false; } } diff --git a/src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp b/src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp index c776c10a..a560cbd1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp @@ -383,7 +383,8 @@ function updateCmpUserInfo(){ } } ,error : function(request , status, error){ - alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); +// alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + alert("오류가 발생하였습니다. \n입력 값을 다시 확인해 주세요."); } }); } @@ -949,7 +950,7 @@ function changeValueWork(obj){
    *대표
    - +
    @@ -1002,7 +1003,7 @@ function changeValueWork(obj){
    상세 주소
    - +
    diff --git a/src/main/webapp/WEB-INF/jsp/web/user/mberInfoChange.jsp b/src/main/webapp/WEB-INF/jsp/web/user/mberInfoChange.jsp index 82de1400..6e1ac69d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mberInfoChange.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberInfoChange.jsp @@ -196,7 +196,8 @@ function updateUserInfo(){ } } ,error : function(request , status, error){ - alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); +// alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); +// alert("입력한 정보를 다시 확인해 주세요"); } }); }