Commit @b2f07dd85779f9c730b88c21d45c9588a2139965

rosewiper 2024-08-26

거래명세서 및 사용내역서 팩스 데이터 처리 오류 수정 - 팩스 성공 건수가 없는 경우 Max/Min 날짜 처리 오류 수정 - 팩스 데이터가 없음에도 화면에는 0건에 대한 데이터가 표시되어 표시 안되도록 수정 처리

 - 팩스 성공 건수가 없는 경우 Max/Min 날짜 처리 오류 수정
 - 팩스 데이터가 없음에도 화면에는 0건에 대한 데이터가 표시되어 표시 안되도록 수정 처리

@b2f07dd85779f9c730b88c21d45c9588a2139965

a68e341

b2f07dd

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml


 	<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

a68e341

b2f07dd

src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp

--- src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp

+++ src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp


                             	</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}">

a68e341

b2f07dd

src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp

--- src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp

+++ src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp


 								</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}">

Add a comment

Open 0
Closed 0

List

...	...	@@ -3622,10 +3622,10 @@
3622	3622	<select id="mjonMsgDAO.selectPayUserSumFaxList" parameterClass="mjonMsgVO" resultClass="mjonMsgVO">
3623	3623	/* 2024.08.23 팩스 데이터 누락으로 추가 */
3624	3624	SELECT
3625		- MAX(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )) AS maxRegDate
3626		- , MIN(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )) AS minRegDate
	3625	+ IFNULL(MAX(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )), 0) AS maxRegDate
	3626	+ , IFNULL(MIN(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )), 0) AS minRegDate
3627	3627	, M.msgTypeName
3628		- , SUM(SentEA) AS ftSendCount
	3628	+ , IFNULL(SUM(SentEA), 0) AS ftSendCount
3629	3629	, ifnull(TRUNCATE(SUM(supplyPrice) , 0), 0) AS supplyPrice
3630	3630	, 0 AS vatPrice
3631	3631	, ifnull(TRUNCATE(SUM(M.TOT_PRICE) , 0), 0) AS totalPrice

...	...	@@ -199,22 +199,24 @@
199	199	</c:if>
200	200
201	201	<c:if test="${empty pageType \|\| pageType == 'fax'}">
202		- <c:forEach var="resultFax" items="${payUserSumFaxList}" varStatus="status">
203		- <tr>
204		- <td>${resultFax.msgTypeName}</td>
205		- <td>
206		- <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.ftSendCount}" var="ftSendCount" />
207		- <c:out value="${ftSendCount}"/>
208		- </td>
209		- <td>
210		- <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.supplyPrice}" var="supplyPrice" />
211		- <c:out value="${supplyPrice}"/>
212		- </td>
213		- <td>
214		- <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.totalPrice}" var="totalPrice" />
215		- <c:out value="${totalPrice}"/>
216		- </td>
217		- </tr>
	202	+ <c:forEach var="resultFax" items="${payUserSumFaxList}" varStatus="status">
	203	+ <c:if test="${resultFax.ftSendCount > 0}">
	204	+ <tr>
	205	+ <td>${resultFax.msgTypeName}</td>
	206	+ <td>
	207	+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.ftSendCount}" var="ftSendCount" />
	208	+ <c:out value="${ftSendCount}"/>
	209	+ </td>
	210	+ <td>
	211	+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.supplyPrice}" var="supplyPrice" />
	212	+ <c:out value="${supplyPrice}"/>
	213	+ </td>
	214	+ <td>
	215	+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.totalPrice}" var="totalPrice" />
	216	+ <c:out value="${totalPrice}"/>
	217	+ </td>
	218	+ </tr>
	219	+ </c:if>
218	220	</c:forEach>
219	221	</c:if>
220	222	<c:if test="${empty resultList && empty payUserSumFaxList}">

...	...	@@ -157,21 +157,23 @@
157	157	</c:if>
158	158	<c:if test="${empty pageType \|\| pageType == 'fax'}">
159	159	<c:forEach var="resultFax" items="${payUserSumFaxList}" varStatus="status">
160		- <tr>
161		- <td>${resultFax.msgTypeName}</td>
162		- <td>
163		- <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.ftSendCount}" var="ftSendCount" />
164		- <c:out value="${ftSendCount}"/>
165		- </td>
166		- <td>
167		- <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.supplyPrice}" var="supplyPrice" />
168		- <c:out value="${supplyPrice}"/>
169		- </td>
170		- <td>
171		- <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.totalPrice}" var="totalPrice" />
172		- <c:out value="${totalPrice}"/>
173		- </td>
174		- </tr>
	160	+ <c:if test="${resultFax.ftSendCount > 0}">
	161	+ <tr>
	162	+ <td>${resultFax.msgTypeName}</td>
	163	+ <td>
	164	+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.ftSendCount}" var="ftSendCount" />
	165	+ <c:out value="${ftSendCount}"/>
	166	+ </td>
	167	+ <td>
	168	+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.supplyPrice}" var="supplyPrice" />
	169	+ <c:out value="${supplyPrice}"/>
	170	+ </td>
	171	+ <td>
	172	+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.totalPrice}" var="totalPrice" />
	173	+ <c:out value="${totalPrice}"/>
	174	+ </td>
	175	+ </tr>
	176	+ </c:if>
175	177	</c:forEach>
176	178	</c:if>
177	179	<c:if test="${ empty resultList && empty payUserSumFaxList}">

Delete comment