[사용자] 팩스 발송 리스트 => 발송결과로 이동

src/main/java/itn/let/fax/user/service/FaxGroupDataVO.java

@@ -211,6 +211,14 @@ public class FaxGroupDataVO extends FaxTranVO implements Serializable {
 	private String successCntMonth;
 	private String successCntYear;
 
+
+	private String totalEaSum;
+    private String holdEaSum;
+    private String sentEaSum;
+    private String unSendEaSum;
+    private String errorEaSum;
+	
+	
 	public String getSuccessDay() {
 		return successDay;
 	}
@@ -688,5 +696,63 @@ public class FaxGroupDataVO extends FaxTranVO implements Serializable {
 			);
 		}
 	}
+
+
+
+
+
+	public String getSearchQuarter() {
+		return searchQuarter;
+	}
+
+	public void setSearchQuarter(String searchQuarter) {
+		this.searchQuarter = searchQuarter;
+	}
+
+	public String getTotalEaSum() {
+		return totalEaSum;
+	}
+
+	public void setTotalEaSum(String totalEaSum) {
+		this.totalEaSum = totalEaSum;
+	}
+
+	public String getHoldEaSum() {
+		return holdEaSum;
+	}
+
+	public void setHoldEaSum(String holdEaSum) {
+		this.holdEaSum = holdEaSum;
+	}
+
+	public String getSentEaSum() {
+		return sentEaSum;
+	}
+
+	public void setSentEaSum(String sentEaSum) {
+		this.sentEaSum = sentEaSum;
+	}
+
+	public String getUnSendEaSum() {
+		return unSendEaSum;
+	}
+
+	public void setUnSendEaSum(String unSendEaSum) {
+		this.unSendEaSum = unSendEaSum;
+	}
+
+	public String getErrorEaSum() {
+		return errorEaSum;
+	}
+
+	public void setErrorEaSum(String errorEaSum) {
+		this.errorEaSum = errorEaSum;
+	}
+	
+	
+	
+	
+	
+	
 	
 }

src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java

@@ -254,8 +254,27 @@ public class FaxServiceImpl extends EgovAbstractServiceImpl implements FaxServic
 		faxGroupDataVO.setLastIndex(paginationInfo.getLastRecordIndex());
 		faxGroupDataVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
 		
+
+		
 		List<FaxGroupDataVO> faxGroupListVO = faxDao.selectFaxSendList_advc(faxGroupDataVO);
 		
+		
+		if(faxGroupListVO.size() >0) {
+		
+			// 총 건수
+		    resultMap.put("totalEaSum"  ,faxGroupListVO.get(0).getTotalEaSum());
+		    System.out.println("faxGroupListVO.get(0).getTotalEaSum() : "+ faxGroupListVO.get(0).getTotalEaSum());
+		    // 총 대기 건수
+		    resultMap.put("holdEaSum"   ,faxGroupListVO.get(0).getHoldEaSum());
+		    // 총 성공 건수
+		    resultMap.put("sentEaSum"   ,faxGroupListVO.get(0).getSentEaSum());
+		    // 총 실패 건수
+		    resultMap.put("errorEaSum"  ,faxGroupListVO.get(0).getErrorEaSum());
+		    // 총 기타 건수
+		    resultMap.put("unSendEaSum" ,faxGroupListVO.get(0).getUnSendEaSum());
+			
+		}
+		
 		paginationInfo.setTotalRecordCount(faxGroupListVO.size() > 0 ? faxGroupListVO.get(0).getTotCnt() : 0);
 		resultMap.put("faxGroupListVO", faxGroupListVO);
 		resultMap.put("paginationInfo", paginationInfo);

src/main/java/itn/let/fax/user/web/FaxController.java

@@ -190,7 +190,23 @@ public class FaxController {
 	    	// 전송내역
 			model.addAttribute("faxGroupListVO", faxSendListMap.get("faxGroupListVO"));
 	    	model.addAttribute("searchKeyword", faxSendListMap.get("searchKeyword"));
-	    	model.addAttribute("paginationInfo", faxSendListMap.get("paginationInfo"));	
+	    	model.addAttribute("paginationInfo", faxSendListMap.get("paginationInfo"));
+	    	
+	    	
+
+			// 총 건수
+		    model.addAttribute("totalEaSum"  ,faxSendListMap.get("totalEaSum"));
+		    // 총 대기 건수
+		    model.addAttribute("holdEaSum"   ,faxSendListMap.get("holdEaSum"));
+		    // 총 성공 건수
+		    model.addAttribute("sentEaSum"   ,faxSendListMap.get("sentEaSum"));
+		    // 총 실패 건수
+		    model.addAttribute("errorEaSum"  ,faxSendListMap.get("errorEaSum"));
+		    // 총 기타 건수
+		    model.addAttribute("unSendEaSum" ,faxSendListMap.get("unSendEaSum"));
+	    	
+	    	
+	    	
 		} catch (Exception e) {
 			e.printStackTrace();
 			// TODO: handle exception

src/main/resources/egovframework/sqlmap/let/fax/Fax_SQL_Mysql.xml

@@ -331,11 +331,7 @@
 		            FROM pgi_faxlist pgf
 		            WHERE pf.seq = pgf.FaxTranSEQ AND ResultCode IN ('6500', '6503', '6504', '6505')
 		        ) AS unSendEa,
-		        COALESCE(pf.ErrorEA, 0) - (
+				COALESCE(pf.ErrorEA, 0) AS errorEa,
-		            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,

src/main/webapp/WEB-INF/jsp/web/fax/faxSendList.jsp

@@ -132,6 +132,18 @@
 		}
 	}
 	
+
+	/* 윈도우팝업 열기 */
+	function infoPop(pageUrl){
+		document.popForm.pageType.value = pageUrl;
+		document.popForm.action = "/web/pop/infoPop.do";
+		document.popForm.method = "post"; 
+		window.open("about:blank", 'infoPop', 'width=790, height=320, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=1');
+		document.popForm.target = "infoPop";
+		document.popForm.submit();
+	}
+
+	
 </script>
 
 
@@ -146,6 +158,8 @@
 			<div class="heading">
 <!-- 				<h2>팩스발송</h2> -->
 				<h2>발송결과</h2>
+				<button type="button" class="button info" onclick="infoPop('selectMsgSentView');">사용안내</button>
+				<button type="button" class="button junk" data-tooltip="popupJunk">통신사 스팸규격안내</button>
 			</div>
 			<div class="pay_tab_wrap">
 				<!-- <ul class="tabType1">
@@ -165,22 +179,25 @@
 					<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="${not empty totalEaSum ? totalEaSum : 0 }" pattern="#,###"/></span> 건</p>
-							<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>
+								<dt>성공</dt>
-								<dd><span class="c_002c9a"><fmt:formatNumber value="${H_allSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
+								<dd><span class="c_002c9a"><fmt:formatNumber value="${not empty sentEaSum ? sentEaSum : 0 }" pattern="#,###"/></span>건</dd>
 							</dl>
 							<dl>
-								<dt>성공</dt>
+								<dt>대기</dt>
-								<dd><span class="c_002c9a"><fmt:formatNumber value="${H_allSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
+								<dd><span class="c_002c9a"><fmt:formatNumber value="${not empty holdEaSum ? holdEaSum : 0 }" pattern="#,###"/></span>건</dd>
 							</dl>
 							<dl>
 								<dt>실패</dt>
-								<dd><span class="c_e40000"><fmt:formatNumber value="${H_allSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
+								<dd><span class="c_e40000"><fmt:formatNumber value="${not empty errorEaSum ? errorEaSum : 0 }" pattern="#,###"/></span>건</dd>
+							</dl>
+							<dl>
+								<dt>기타</dt>
+								<dd><span class="c_e40000"><fmt:formatNumber value="${not empty unSendEaSum ? unSendEaSum : 0 }" pattern="#,###"/></span>건</dd>
 							</dl>
 						</div>
 					</div>
@@ -245,8 +262,8 @@
 							<col style="width: 6%;">
 							<col style="width: 6%;">
 							<col style="width: 6%;">
-							<col style="width: 10%;">
+<%-- 							<col style="width: 10%;"> --%>
-							<col style="width: 10%;">
+<%-- 							<col style="width: 10%;"> --%>
 						</colgroup>
 						<thead>
 							<tr>
@@ -273,7 +290,7 @@
 									</div>
 								</th>
 								<th colspan="4">발송결과 건수</th>
-								<th rowspan="2">발송금액
+								<!-- <th rowspan="2">발송금액
 									<div class="sort_wrap">
 										<input type="button" class="sort sortBtn" id="totPrice">
 									</div>
@@ -282,7 +299,7 @@
 									<div class="sort_wrap">
 										<input type="button" class="sort sortBtn" id="refundPrice">
 									</div>
-								</th>
+								</th> -->
 							</tr>
 							<tr>
 								<th>성공</th>
@@ -313,18 +330,17 @@
 									<td>
 										<p class="c_e40000">${result.unSendEa }</p>
 									</td>
-													
+									<%-- <td>
-									<td>
 										<fmt:formatNumber value="${result.totPrice }" pattern="#,###.#"/>
 									</td>
 									<td>
 										<p class="c_e40000"><fmt:formatNumber value="${result.refundPrice }" pattern="#,###.#"/></p>
-									</td>
+									</td> --%>
 								</tr>
 							</c:forEach>
 							<c:if test="${empty faxGroupListVO}">
 							   <tr>
-							       <td colspan="11">전송내역이 없습니다.</td>
+							       <td colspan="9">전송내역이 없습니다.</td>
 							   </ul>
 							</c:if>
 						</tbody>
@@ -351,6 +367,9 @@
 	</div><!--// send top -->
 <!-- send bottom -->
 </div>
+	<form name="popForm" id="popForm" method="post">
+		<input type="hidden" name="pageType" id="pageType" value=""/> 
+	</form>
 <!-- <form id="msgResendForm" name="msgResendForm" method="post"> -->
 <!-- 	<input name="msgResendFlag" type="hidden" value="N"/> -->
 <!-- 	<input name="msgSeqList" type="hidden" value=""/> -->