From b2f07dd85779f9c730b88c21d45c9588a2139965 Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Mon, 26 Aug 2024 11:07:06 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B1=B0=EB=9E=98=EB=AA=85=EC=84=B8=EC=84=9C?=
 =?UTF-8?q?=20=EB=B0=8F=20=EC=82=AC=EC=9A=A9=EB=82=B4=EC=97=AD=EC=84=9C=20?=
 =?UTF-8?q?=ED=8C=A9=EC=8A=A4=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=20-=20?=
 =?UTF-8?q?=ED=8C=A9=EC=8A=A4=20=EC=84=B1=EA=B3=B5=20=EA=B1=B4=EC=88=98?=
 =?UTF-8?q?=EA=B0=80=20=EC=97=86=EB=8A=94=20=EA=B2=BD=EC=9A=B0=20Max/Min?=
 =?UTF-8?q?=20=EB=82=A0=EC=A7=9C=20=EC=B2=98=EB=A6=AC=20=EC=98=A4=EB=A5=98?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=20-=20=ED=8C=A9=EC=8A=A4=20=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=84=B0=EA=B0=80=20=EC=97=86=EC=9D=8C=EC=97=90?=
 =?UTF-8?q?=EB=8F=84=20=ED=99=94=EB=A9=B4=EC=97=90=EB=8A=94=200=EA=B1=B4?=
 =?UTF-8?q?=EC=97=90=20=EB=8C=80=ED=95=9C=20=EB=8D=B0=EC=9D=B4=ED=84=B0?=
 =?UTF-8?q?=EA=B0=80=20=ED=91=9C=EC=8B=9C=EB=90=98=EC=96=B4=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=20=EC=95=88=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/let/msg/MjonMsgData_SQL_mysql.xml  |  6 ++--
 .../jsp/web/pay/MsgPrintStatementPopUp.jsp    | 34 ++++++++++---------
 .../jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp | 32 +++++++++--------
 3 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
index 4bc1fa87..1ab8e818 100644
--- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
@@ -3622,10 +3622,10 @@
 	<select id="mjonMsgDAO.selectPayUserSumFaxList" parameterClass="mjonMsgVO" resultClass="mjonMsgVO">
 		/* 2024.08.23 팩스 데이터 누락으로 추가  */
 		SELECT
-			MAX(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )) AS maxRegDate
-			, MIN(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )) AS minRegDate 
+			IFNULL(MAX(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )), 0) AS maxRegDate
+			, IFNULL(MIN(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )), 0) AS minRegDate 
 			, M.msgTypeName
-			, SUM(SentEA) AS ftSendCount
+			, IFNULL(SUM(SentEA), 0) AS ftSendCount
 			, ifnull(TRUNCATE(SUM(supplyPrice) , 0), 0) AS supplyPrice
 			, 0 AS vatPrice
 			, ifnull(TRUNCATE(SUM(M.TOT_PRICE) , 0), 0) AS totalPrice
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp
index e4af170b..36062f9c 100644
--- a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp
@@ -199,22 +199,24 @@ function f_print(){
                             	</c:if>			
                             	
                             	<c:if test="${empty pageType || pageType == 'fax'}">
-									<c:forEach var="resultFax" items="${payUserSumFaxList}" varStatus="status">
-										<tr>
-		                            		<td>${resultFax.msgTypeName}</td>
-		                            		<td>
-                            					<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.ftSendCount}" var="ftSendCount" />
-												<c:out value="${ftSendCount}"/>
-		                            		</td>
-		                            		<td>
-			                            		<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.supplyPrice}" var="supplyPrice" />
-												<c:out value="${supplyPrice}"/>
-	                            			</td>
-		                            		<td>
-		                            			<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.totalPrice}" var="totalPrice" />
-												<c:out value="${totalPrice}"/>
-	                            			</td>
-		                            	</tr>
+									<c:forEach var="resultFax" items="${payUserSumFaxList}" varStatus="status">	
+										<c:if test="${resultFax.ftSendCount > 0}">
+											<tr>
+			                            		<td>${resultFax.msgTypeName}</td>
+			                            		<td>
+	                            					<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.ftSendCount}" var="ftSendCount" />
+													<c:out value="${ftSendCount}"/>
+			                            		</td>
+			                            		<td>
+				                            		<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.supplyPrice}" var="supplyPrice" />
+													<c:out value="${supplyPrice}"/>
+		                            			</td>
+			                            		<td>
+			                            			<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.totalPrice}" var="totalPrice" />
+													<c:out value="${totalPrice}"/>
+		                            			</td>
+			                            	</tr>
+		                            	</c:if>
 									</c:forEach>
 								</c:if>
 								<c:if test="${empty resultList && empty payUserSumFaxList}">
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp
index e539e53f..9238f78c 100644
--- a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp
@@ -157,21 +157,23 @@ function f_print(){
 								</c:if>
 								<c:if test="${empty pageType || pageType == 'fax'}">
 									<c:forEach var="resultFax" items="${payUserSumFaxList}" varStatus="status">
-										<tr>
-		                            		<td>${resultFax.msgTypeName}</td>
-		                            		<td>
-                            					<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.ftSendCount}" var="ftSendCount" />
-												<c:out value="${ftSendCount}"/>
-		                            		</td>
-		                            		<td>
-		                            			<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.supplyPrice}" var="supplyPrice" />
-												<c:out value="${supplyPrice}"/>		                            		
-	                            			</td>
-		                            		<td>
-		                            			<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.totalPrice}" var="totalPrice" />
-												<c:out value="${totalPrice}"/>
-	                            			</td>
-		                            	</tr>		
+										<c:if test="${resultFax.ftSendCount > 0}">
+											<tr>
+			                            		<td>${resultFax.msgTypeName}</td>
+			                            		<td>
+	                            					<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.ftSendCount}" var="ftSendCount" />
+													<c:out value="${ftSendCount}"/>
+			                            		</td>
+			                            		<td>
+			                            			<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.supplyPrice}" var="supplyPrice" />
+													<c:out value="${supplyPrice}"/>		                            		
+		                            			</td>
+			                            		<td>
+			                            			<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.totalPrice}" var="totalPrice" />
+													<c:out value="${totalPrice}"/>
+		                            			</td>
+			                            	</tr>		
+		                            	</c:if>
 		                            </c:forEach>
 								</c:if>
 								<c:if test="${ empty resultList && empty payUserSumFaxList}">