chominsoo4245 / mjon_git star
Forked from hylee / mjon_git
이호영 이호영 2024-07-15
fax 화면 개선 중
@e280a9d1ceab5d35edf76e1dce3211219efaad9b
082070c
e280a9d
src/main/java/itn/let/fax/user/service/impl/FaxDAO.java
--- src/main/java/itn/let/fax/user/service/impl/FaxDAO.java
+++ src/main/java/itn/let/fax/user/service/impl/FaxDAO.java
@@ -90,6 +90,9 @@
 
 	public List<FaxGroupDataVO> selectFaxSendList(FaxGroupDataVO faxGroupDataVO) {
 
 		return (List<FaxGroupDataVO>) list("faxDAO.selectFaxSendList", faxGroupDataVO);
 
 	}
 
+	public List<FaxGroupDataVO> selectFaxSendList_advc(FaxGroupDataVO faxGroupDataVO) {
 
+		return (List<FaxGroupDataVO>) list("faxDAO.selectFaxSendList_advc", faxGroupDataVO);
 
+	}
 
 	
 	public List<FaxGroupDataVO> selectFaxSendDetailList(FaxGroupDataVO faxGroupDataVO) {
 
 		return (List<FaxGroupDataVO>) list("faxDAO.selectFaxSendDetailList", faxGroupDataVO);
@@ -149,4 +152,5 @@
 
 	public List<FaxGroupDataVO> selectMyFaxSendList(FaxGroupDataVO faxGroupDataVO) {
 
 		return (List<FaxGroupDataVO>) list("faxDAO.selectMyFaxSendList", faxGroupDataVO);
 
 	}
 
+
 
 }
(No newline at end of file)
082070c
e280a9d
src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java
--- src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java
+++ src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java
@@ -254,7 +254,7 @@
 
 		faxGroupDataVO.setLastIndex(paginationInfo.getLastRecordIndex());
 
 		faxGroupDataVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
 
 		
-		List<FaxGroupDataVO> faxGroupListVO = faxDao.selectFaxSendList(faxGroupDataVO);
 
+		List<FaxGroupDataVO> faxGroupListVO = faxDao.selectFaxSendList_advc(faxGroupDataVO);
 
 		
 		paginationInfo.setTotalRecordCount(faxGroupListVO.size() > 0 ? faxGroupListVO.get(0).getTotCnt() : 0);
 
 		resultMap.put("faxGroupListVO", faxGroupListVO);
082070c
e280a9d
src/main/resources/egovframework/sqlmap/let/fax/Fax_SQL_Mysql.xml
--- src/main/resources/egovframework/sqlmap/let/fax/Fax_SQL_Mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/fax/Fax_SQL_Mysql.xml
@@ -286,6 +286,105 @@
 
 		LIMIT  #recordCountPerPage# OFFSET #firstIndex#	
 	</select>
 
 	
+	
+	<select id="faxDAO.selectFaxSendList_advc" resultClass="faxGroupDataVO" parameterClass="faxGroupDataVO">
 
+	
+		SELECT
 
+		    tb.totCnt,
 
+		    tb.faxGroupId,
 
+		    tb.userId,
 
+		    tb.orignlFileNm,
 
+		    tb.subject,
 
+		    tb.sendStatus,
 
+		    tb.doneDate,
 
+		    tb.page,
 
+		    tb.totalEa,
 
+		    tb.holdEa,
 
+		    tb.sentEa,
 
+		    tb.unSendEa,
 
+		    tb.errorEa,
 
+		    tb.eachPrice,
 
+		    tb.totPrice,
 
+		    tb.refundPrice,
 
+		    tb.reqDate,
 
+		    SUM(tb.totalEa) OVER () AS totalEaSum,
 
+		    SUM(tb.holdEa) OVER () AS holdEaSum,
 
+		    SUM(tb.sentEa) OVER () AS sentEaSum,
 
+		    SUM(tb.unSendEa) OVER () AS unSendEaSum,
 
+		    SUM(tb.errorEa) OVER () AS errorEaSum
 
+		FROM
 
+		    (
 
+		    SELECT
 
+		        COUNT(1) OVER () AS totCnt,
 
+		        mjf.FAX_GROUP_ID AS faxGroupId,
 
+		        mjf.USER_ID AS userId,
 
+		        mjc.ORIGNL_FILE_NM AS orignlFileNm,
 
+		        pf.Subject AS subject,
 
+		        pf.SendStatus AS sendStatus,
 
+		        date_format(pf.DoneDate, '%Y-%m-%d %H:%i') AS doneDate,
 
+		        COALESCE(pf.Page, mjf.FAX_PAGE_CNT) AS page,
 
+		        IF(COALESCE(pf.TotalEA, 0) = 0, mjf.FAX_GROUP_CNT, COALESCE(pf.TotalEA, 0)) AS totalEa,
 
+		        IF(COALESCE(pf.TotalEA, 0) = 0, mjf.FAX_GROUP_CNT, IF(pf.SentEA = 0 AND pf.ErrorEA = 0, pf.TotalEA, 0)) AS holdEa,
 
+		        COALESCE(pf.SentEA, 0) AS sentEa,
 
+		        (
 
+		            SELECT count(*)
 
+		            FROM pgi_faxlist pgf
 
+		            WHERE pf.seq = pgf.FaxTranSEQ AND ResultCode IN ('6500', '6503', '6504', '6505')
 
+		        ) AS unSendEa,
 
+		        COALESCE(pf.ErrorEA, 0) - (
 
+		            SELECT count(*)
 
+		            FROM pgi_faxlist pgf
 
+		            WHERE pf.seq = pgf.FaxTranSEQ AND ResultCode IN ('6500', '6503', '6504', '6505')
 
+		        ) AS errorEa,
 
+		        mjf.EACH_PRICE AS eachPrice,
 
+		        mjf.TOT_PRICE AS totPrice,
 
+		        IF(pf.ErrorEA != 0, (pf.ErrorEA * pf.Page * mjf.EACH_PRICE), 0) AS refundPrice,
 
+		        date_format(pf.ReqDate, '%Y-%m-%d %H:%i') AS reqDate
 
+		    FROM
 
+		        pgi_faxtran pf
 
+		    LEFT JOIN mj_fax_group_data mjf ON pf.seq = mjf.PGI_FAXTRAN_SEQ
 
+		    LEFT JOIN mj_fax_convert_mng mjc ON mjf.CONVERT_MNG_SEQ = mjc.CONVERT_MNG_SEQ
 
+		    WHERE
 
+		        1 = 1
 
+					<isNotEmpty property="userId">
 
+				    	AND mjf.USER_ID = #userId#
 
+			    	</isNotEmpty>
 
+					<isNotEmpty property="searchStartDate">
 
+						<![CDATA[ 
+							AND DATE_FORMAT(reqDate, '%Y-%m-%d') >= DATE_FORMAT(#searchStartDate#, '%Y-%m-%d')
 
+						]]>
 
+					</isNotEmpty>
 
+					<isNotEmpty property="searchEndDate">
 
+						<![CDATA[ 
+							AND 	DATE_FORMAT(reqDate, '%Y-%m-%d')  <=  DATE_FORMAT(#searchEndDate#, '%Y-%m-%d')  
+						]]>
 
+					</isNotEmpty>
 
+			 		<isNotEmpty property="searchKeyword">
 
+						<!-- 현재는 검색 조건이 하나지만 추후를 위해 남김 -->
 
+						<isEqual property="searchCondition" compareValue="1">
 
+							AND mjf.USER_ID LIKE CONCAT ('%', #searchKeyword#,'%')
 
+						</isEqual>
 
+						<isEqual property="searchCondition" compareValue="2">
 
+							AND pf.Subject LIKE CONCAT ('%', #searchKeyword#,'%')
 
+						</isEqual>
 
+				 	</isNotEmpty>
 
+		    ) AS tb
 
+		ORDER BY
 
+		    1 = 1
 
+				<isNotEmpty property="searchSortCnd">
 
+					,$searchSortCnd$
 
+				</isNotEmpty>
 
+				<isNotEmpty property="searchSortOrd">
 
+				 	$searchSortOrd$
 
+				</isNotEmpty>
 
+				LIMIT  #recordCountPerPage# OFFSET #firstIndex#	
+	
+	
+	
+	
+	</select>
 
+	
+	
 	<select id="faxDAO.getExcelForFaxSendList" resultClass="faxGroupDataVO" parameterClass="faxGroupDataVO">
 
 	
 		select
082070c
e280a9d
src/main/webapp/WEB-INF/jsp/layout/include/defaultResource.jsp
--- src/main/webapp/WEB-INF/jsp/layout/include/defaultResource.jsp
+++ src/main/webapp/WEB-INF/jsp/layout/include/defaultResource.jsp
@@ -43,6 +43,7 @@
 
 			20240704 이호영 추가 /cmnDateAndChk.js
 
 		 -->
 
 		<script type="text/javascript" src="/publish/js/dateUtils.js"></script>
 
+		<script type="text/javascript" src="/publish/js/urlUtils.js"></script>
 
 		<script type="text/javascript" src="/publish/js/content.js?date=202211070003"></script>
 
 		<script type="text/javascript" src="/publish/js/popupLayer.js"></script>
 
 		<script type="text/javascript" src="/publish/js/popup.js"></script>
082070c
e280a9d
src/main/webapp/WEB-INF/jsp/web/fax/faxSendList.jsp
--- src/main/webapp/WEB-INF/jsp/web/fax/faxSendList.jsp
+++ src/main/webapp/WEB-INF/jsp/web/fax/faxSendList.jsp
@@ -144,20 +144,48 @@
 
 	<div class="send_top">
 
 		<div class="serv_content fax_content current">
 
 			<div class="heading">
 
-				<h2>팩스발송</h2>
 
+<!-- 				<h2>팩스발송</h2> -->
 
+				<h2>발송결과</h2>
 
 			</div>
 
 			<div class="pay_tab_wrap">
 
-				<ul class="tabType1">
 
+				<!-- <ul class="tabType1">
 
 					<li class="tab">
 
 						<button type="button" onclick="goPage()">팩스전송</button>
 
 					</li>
 
 					<li class="tab active">
 
 						<button type="button">팩스전송내역</button>
 
 					</li>
 
-				</ul>
 
+				</ul> -->
 
+					<%@include file="/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp" %>
 
 			</div>
 
 			<!--// tab button 끝-->
 
 		
+<!-- 			<div class="rev_content" id="tab5_1"> -->
 
+				<div class="rev_admin" id ="revAdmin">
 
+					<div class="rev_admin_in">
 
+						<div class="rev_admin_top clearfix">
 
+							<p>전체</p>
 
+							<c:set var="allTotal" value="${H_allSentCntVO.totCnt + A_allSentCntVO.totCnt }" />
 
+							<p><span><fmt:formatNumber value="${allTotal }" pattern="#,###"/></span> 건</p>
 
+						</div>
 
+						<div class="rev_admin_btm admin_btm">
 
+<%-- 							<P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_allSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P> --%>
 
+							<dl>
 
+								<dt>대기</dt>
 
+								<dd><span class="c_002c9a"><fmt:formatNumber value="${H_allSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
 
+							</dl>
 
+							<dl>
 
+								<dt>성공</dt>
 
+								<dd><span class="c_002c9a"><fmt:formatNumber value="${H_allSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
 
+							</dl>
 
+							<dl>
 
+								<dt>실패</dt>
 
+								<dd><span class="c_e40000"><fmt:formatNumber value="${H_allSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
 
+							</dl>
 
+						</div>
 
+					</div>
 
+				</div>
 
+<!-- 			</div> -->
 
 			<form id="faxSendListForm" name="faxSendListForm" action="" method="post">
 
 				<input type="hidden" id="pageIndex" name="pageIndex" value="${searchVO.pageIndex}"/>
 
 				<input type="hidden" name="searchSortCnd" id="searchSortCnd" value="<c:out value="${searchVO.searchSortCnd}" />" />
 
e280a9d
src/main/webapp/WEB-INF/jsp/web/fax/faxSendList_backup_advc_20240712.jsp (added)
+++ 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" %>
+
+<script src="/publish/js/content.js"></script>
+<script src="/js/user/fax/sendListInit.js"></script>
+<script type="text/javascript" src="<c:out value='/js/common/popup.js' />"></script>
+<!-- 스프레드시트(타뷸레이터)관련 js -->
+<!-- <script src="/js/user/fax/tabulator.js"></script> -->
+<!-- 주소록관련 js -->
+<!-- <script src="/js/user/fax/addr.js"></script> -->
+<!-- 엑셀불러오기관련 js -->
+<!-- <script src="/js/user/fax/exelLoad.js"></script> -->
+
+<!-- 현재 jsp에서 사용하는 file 관련 js  -->
+<%-- <script type="text/javascript" src="<c:out value='/js/user/fax/file.js' />"></script> --%>
+<script type="text/javascript">
+
+	$(document).ready(function(){
+		
+		fn_init();
+		
+		$('.sort').click(function(){
+			/* 
+				내림차순 sortBtnDesc
+				오름차순 sortBtn
+			*/
+			var sortOrd = 'desc';
+			if($(this).hasClass("sortBtnDesc"))
+			{
+				sortOrd = 'asc';
+			}
+			$('#faxSendListForm #searchSortOrd').val(sortOrd);
+			$('#faxSendListForm #searchSortCnd').val($(this).attr('id'));
+			linkPage(1);
+		});
+		
+		// 줄보기 선택 체인지 function
+		$('#pageUnitSelect').change(function(){
+			$('#faxSendListForm #pageUnit').val($(this).val());
+			linkPage(1);
+		});
+		
+
+
+		$('.goDetail').click(function(){
+			
+			$('#goDetailForm #faxGroupId').val($(this).data('info'));
+			
+			var windowTargetName = "faxSendDetailPopup";
+//	 		var features = "width=930, height=860, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=yes";
+			// 2.POST로 데이터 전달
+			document.goDetailForm.target=windowTargetName;
+			showPopup2('',windowTargetName ,'900','800');
+			document.goDetailForm.submit();
+			
+		});
+		
+
+		$('#excelDownLoad').click(function(){
+			if($('#dataCnt').text() != 0)
+			{
+				$('#faxSendListForm').attr('action', '/web/mjon/fax/getExcelForFaxSendList.do');
+				$('#faxSendListForm').submit();
+			}else{
+				alert("전송내역이 없습니다.")
+			}
+		});
+
+		$('#printfaxSentData').click(function(){
+
+			var windowTargetName = "printfaxSentData";
+			// 2.POST로 데이터 전달
+			$('#faxSendListForm').attr('target', windowTargetName);
+			showPopup2('',windowTargetName ,'900','800');
+			$('#faxSendListForm').attr('action', '/web/mjon/fax/printfaxSentDataAjax.do');
+			$('#faxSendListForm').submit();
+
+
+		});
+		
+		$('.dateClick').click(function(){
+			linkPage(1);
+		});
+		
+		
+		
+	});
+	 
+	function fn_init(){
+		
+		// 정렬 화살표 변경
+		var cnd = '<c:out value="${searchVO.searchSortCnd}" />';
+		var ord = '<c:out value="${searchVO.searchSortOrd}" />';
+		var $sortInput = $('#'+cnd);
+		if(ord == 'desc')
+		{
+			$sortInput
+				.removeClass('sortBtn')
+				.addClass('sortBtn'+ord.charAt(0).toUpperCase() + ord.slice(1));
+		}
+		// //정렬 변경
+		
+	}
+	
+	
+	function linkPage(page){
+		$('#faxSendListForm').attr('target', '');
+		$('#faxSendListForm #pageIndex').val(page);
+		$('#faxSendListForm').attr('action', '/web/mjon/fax/faxSendList.do');
+		$('#faxSendListForm').submit();
+	}
+
+	function goPage(){
+		location.href="<c:url value='/web/mjon/fax/faxDataView.do'/>";
+	}
+
+	//캘린더에 날짜 입력해 주기
+	function setCalVal(val,targetObj){
+		$('input[name='+targetObj+']').val(val) ;
+	}
+
+	// 검색 엔터 키 적용
+	function enterkey() {
+		if (window.event.keyCode == 13) {
+			// 엔터키가 눌렸을 때 실행할 내용
+			linkPage(1);
+		}
+	}
+	
+</script>
+
+
+<form id="goDetailForm" name="goDetailForm" action="<c:url value='/web/mjon/fax/faxSendDetailPopup.do'/>" method="post">
+	<input type="hidden" id="faxGroupId" name="faxGroupId" value=""/>
+</form>
+
+<div class="inner">
+	<!-- send top -->
+	<div class="send_top">
+		<div class="serv_content fax_content current">
+			<div class="heading">
+				<h2>팩스발송</h2>
+			</div>
+			<div class="pay_tab_wrap">
+				<ul class="tabType1">
+					<li class="tab">
+						<button type="button" onclick="goPage()">팩스전송</button>
+					</li>
+					<li class="tab active">
+						<button type="button">팩스전송내역</button>
+					</li>
+				</ul>
+			</div>
+			<!--// tab button 끝-->
+		
+			<form id="faxSendListForm" name="faxSendListForm" action="" method="post">
+				<input type="hidden" id="pageIndex" name="pageIndex" value="${searchVO.pageIndex}"/>
+				<input type="hidden" name="searchSortCnd" id="searchSortCnd" value="<c:out value="${searchVO.searchSortCnd}" />" />
+				<input type="hidden" name="searchSortOrd" id="searchSortOrd" value="<c:out value="${searchVO.searchSortOrd}" />" />
+				<input type="hidden" name="pageUnit" id="pageUnit" value="<c:out value="${searchVO.pageUnit}" />" />
+				<div class="excel_middle">
+					<div class="select_btnWrap clearfix">
+						<div class="btn_left">
+							<span class="cal_label">기간선택</span>
+							<div class="calendar_wrap">
+								<input type="text" class="startDate inp calendar" title="검색 시작일" id="searchStartDate" name="searchStartDate" value="<c:out value='${searchVO.searchStartDate}'/>" data-datecontrol="true">
+								<span class="dateEtc">~</span>
+								<input type="text" class="endDate inp calendar" title="검색 종료일" id="searchEndDate" name="searchEndDate" value="<c:out value='${searchVO.searchEndDate}'/>" data-datecontrol="true">
+							</div>
+							<button type="button" onclick="setCalVal(lastfulstday,'searchStartDate');setCalVal( lastfuledday,'searchEndDate'); return false;"  class="btnType btnType19 dateClick">전월</button>
+							<button type="button" onclick="setCalVal(thisfulstlday,'searchStartDate');setCalVal( thisfuledtlday,'searchEndDate'); return false;"  class="btnType btnType19 dateClick">당월</button>
+							<button type="button" onclick="setCalVal(threefulstday,'searchStartDate');setCalVal( threefuledday,'searchEndDate'); return false;"  class="btnType btnType19 dateClick">3개월</button>
+							<button type="button" class="btnType6" onClick="javascript:linkPage(1); return false;">조회</button>
+						</div>
+						<div class="btn_right">
+							<label for="searchCondition" class="label">제목 선택</label>
+							<select name="searchCondition" id="searchCondition" class="selType2">
+								<option value="2" <c:if test="${searchVO.searchCondition == '2'}">selected</c:if> >제목</option>
+							</select>
+							<div class="search">
+								<label for="id" class="label"></label>
+								<input type="text" id="searchKeyword" name="searchKeyword" value="<c:out value='${searchVO.searchKeyword}'/>" onkeyup="enterkey();" placeholder="검색어를 입력하세요." onfocus="this.placeholder=''" onblur="this.placeholder='검색어를 입력하세요.'" >
+								<button type="button" class="btnType btnType2" onClick="javascript:linkPage(1); return false;">검색</button>
+							</div>
+						</div>
+					</div>
+				</div>
+			</form>
+			<!-- 팩스전송내역 -->
+			<div class="tab_content current" id="tab_content_2">
+				<div class="list_info">
+					<input type="hidden" id="tdType" value="groupList">
+					<p>총 <span class="c_e40000" id="dataCnt">${paginationInfo.totalRecordCount }</span>건</p>
+					<div>
+						<label for="pageUnitSelect" class="label">줄보기 선택</label>
+						<select id="pageUnitSelect" class="selType2">
+							<option value="10" ${searchVO.pageUnit == 10 ? 'selected' : ''}>10개보기</option>
+							<option value="20" ${searchVO.pageUnit == 20 ? 'selected' : ''}>20개보기</option>
+							<option value="30" ${searchVO.pageUnit == 30 ? 'selected' : ''}>30개보기</option>
+						</select>
+					</div>
+				</div>
+				<div class="tb_wrap">
+					<table class="tType4">
+						<colgroup>
+							<col style="width: 50px;">
+							<col style="width: auto;">
+							<col style="width: 15%;">
+							<col style="width: 9%;">
+							<col style="width: 8%;">
+							<col style="width: 6%;">
+							<col style="width: 6%;">
+							<col style="width: 6%;">
+							<col style="width: 6%;">
+							<col style="width: 10%;">
+							<col style="width: 10%;">
+						</colgroup>
+						<thead>
+							<tr>
+								<th rowspan="2">
+								</th>
+								<th rowspan="2">제목
+									<div class="sort_wrap">
+										<input type="button" class="sort sortBtn" id="subject">
+									</div>
+								</th>
+								<th rowspan="2">전송시간
+									<div class="sort_wrap">
+										<input type="button" class="sort sortBtn" id="doneDate">
+									</div>
+								</th>
+								<th rowspan="2">문서매수
+									<div class="sort_wrap">
+										<input type="button" class="sort sortBtn" id="page">
+									</div>
+								</th>
+								<th rowspan="2">발송건수
+									<div class="sort_wrap">
+										<input type="button" class="sort sortBtn" id="totalEa">
+									</div>
+								</th>
+								<th colspan="4">발송결과 건수</th>
+								<th rowspan="2">발송금액
+									<div class="sort_wrap">
+										<input type="button" class="sort sortBtn" id="totPrice">
+									</div>
+								</th>
+								<th rowspan="2">환불금액
+									<div class="sort_wrap">
+										<input type="button" class="sort sortBtn" id="refundPrice">
+									</div>
+								</th>
+							</tr>
+							<tr>
+								<th>성공</th>
+								<th>대기</th>
+								<th>실패</th>
+								<th style="border-right: 1px solid #d5d5d5;">기타</th>
+							</tr>
+						</thead>
+						<tbody>
+							<c:forEach var="result" items="${faxGroupListVO }" varStatus="i">
+								<tr>
+<%-- 											<td>${(searchVO.pageIndex* searchVO.pageUnit) - searchVO.pageUnit - i.index}</td> --%>
+									<td>${(searchVO.pageIndex* searchVO.pageUnit) - searchVO.pageUnit+i.index+1}</td>
+<%-- 											<td><a href="#none" onclick="fn_goDetail(${result.faxGroupId})">${result.subject }</td> --%>
+									<td data-info="${result.faxGroupId}" style="cursor : pointer;" class="goDetail">${result.subject }</td>
+									<td>${result.reqDate }</a></td>
+									<td>${result.page }</td>
+									<td>${result.totalEa }</td>
+									<td>
+										<p class="c_002c9a">${result.sentEa }</p>
+									</td>
+									<td>
+										<p class="c_222">${result.holdEa }</p>
+									</td>
+									<td>
+										<p class="c_e40000">${result.errorEa }</p>
+									</td>
+									<td>
+										<p class="c_e40000">${result.unSendEa }</p>
+									</td>
+													
+									<td>
+										<fmt:formatNumber value="${result.totPrice }" pattern="#,###.#"/>
+									</td>
+									<td>
+										<p class="c_e40000"><fmt:formatNumber value="${result.refundPrice }" pattern="#,###.#"/></p>
+									</td>
+								</tr>
+							</c:forEach>
+							<c:if test="${empty faxGroupListVO}">
+							   <tr>
+							       <td colspan="11">전송내역이 없습니다.</td>
+							   </ul>
+							</c:if>
+						</tbody>
+					</table>
+				</div>
+			<div class="table_btn clearfix">
+				<div class="table_btn_left">
+				</div>
+				<div class="table_btn_right">
+					<button type="button" class="excel_btn btnType" id="excelDownLoad"><i class="downroad"></i>엑셀 다운로드</button>
+					<button type="button" class="print_btn btnType" id="printfaxSentData"></i>발송결과 출력하기</button>
+				</div>
+			</div>
+				<c:if test="${!empty faxGroupListVO}">
+				   <ul class="pagination">
+				       <ui:pagination paginationInfo = "${paginationInfo}"  type="imageWeb" jsFunction="linkPage" />
+				   </ul>
+				</c:if>
+			</div>
+			<!-- //팩스전송내역 -->
+		
+			<!-- tab content1 -->
+		</div>
+	</div><!--// send top -->
+<!-- send bottom -->
+</div>
+<!-- <form id="msgResendForm" name="msgResendForm" method="post"> -->
+<!-- 	<input name="msgResendFlag" type="hidden" value="N"/> -->
+<!-- 	<input name="msgSeqList" type="hidden" value=""/> -->
+<!-- </form> -->
+<!-- <form id="moveAddrForm" name="moveAddrForm" method="post"> -->
+<!-- 	<input name="moveAddrFlag" type="hidden" value="N"/> -->
+<!-- 	<input name="addrIdList" type="hidden" value=""/> -->
+<!-- </form> -->
+
082070c
e280a9d
src/main/webapp/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp
--- src/main/webapp/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp
@@ -9,22 +9,31 @@
 
 	
 });
 
 
+
 
+
 
 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 @@
 
 		<button type="button" onclick="javascript:fnLinkPageTab('tabKakao');return false;">카카오톡</button>
 
 	</li>
 
 	<li class="tab topTab" id="faxTab">
 
-		<button type="button" onclick="javascript:fnLinkPageTab('tabFax');return false;">카카오톡</button>
 
+		<button type="button" onclick="javascript:fnLinkPageTab('tabFax');return false;">팩스</button>
 
 	</li>
 
 </ul>
(No newline at end of file)
082070c
e280a9d
src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp
--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp
@@ -310,7 +310,7 @@
 
 	else {
 
 		if ($("#startDate").val() < prevMonth(3)) {
 
 			alert("최근 3개월까지만 다운로드 가능합니다.")
 
-			return false; 			
+// 			return false; 			
 		}
 
 	}
082070c
e280a9d
src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp
--- src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp
+++ src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp
@@ -383,7 +383,8 @@
 
 				}
 
 			}
 
 			,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 @@
 
                       <div class="input_left"><span class="essential">*</span>대표</div>
 
                       <div class="input_right">
 
                         <label for="" class="label">대표명 입력</label>
 
-                        <input type="text" class="list_inputType1" name="ceoNm" maxlength="50" value="${userInfo.ceoNm}"/>
 
+                        <input type="text" class="list_inputType1" name="ceoNm" maxlength="30" value="${userInfo.ceoNm}"/>
 
                       </div>
 
                     </div>
 
                     <div class="input_list_item input_list_biz">
@@ -1002,7 +1003,7 @@
 
                       <div class="input_left">상세 주소</div>
 
                       <div class="input_right">
 
                         <label for="detailAdres" class="label">사업장 주소 상세 입력</label>
 
-                        <input type="text" class="list_inputType1 colorLight" name="detailAdres" size="100" value="${userInfo.detailAdres}"/>
 
+                        <input type="text" class="list_inputType1 colorLight" name="detailAdres" maxlength="30" size="100" value="${userInfo.detailAdres}"/>
 
                       </div>
 
                     </div>
 
                     <div class="mem_btnWrap2 justify">
082070c
e280a9d
src/main/webapp/WEB-INF/jsp/web/user/mberInfoChange.jsp
--- src/main/webapp/WEB-INF/jsp/web/user/mberInfoChange.jsp
+++ src/main/webapp/WEB-INF/jsp/web/user/mberInfoChange.jsp
@@ -196,7 +196,8 @@
 
 			}
 
 		}
 
 		,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("입력한 정보를 다시 확인해 주세요");
 
 		}
 
 	});
 
 }
Add a comment
List