From a68e341ff8e54cf1b28488a28a09d983d4e06506 Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Mon, 26 Aug 2024 10:42:33 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B1=B0=EB=9E=98=EB=AA=85=EC=84=B8=EC=84=9C/?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EB=82=B4=EC=97=AD=EC=84=9C=20=ED=8C=9D?=
 =?UTF-8?q?=EC=97=85=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A0=95=EB=A0=AC=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=20-=20msg=5Ftype=20=EC=BB=AC=EB=9F=BC?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=A0=95=EB=A0=AC=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/let/msg/MjonMsgData_SQL_mysql.xml             | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 d0f3ca43..4bc1fa87 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
@@ -3530,7 +3530,7 @@
 	<!-- 사용자 요금 사용내역 Sum 리스트 -->
 	<select id="mjonMsgDAO.selectPayUserSumList" parameterClass="mjonMsgVO" resultClass="mjonMsgVO">		
 		/* 2024.01.26 검색 기준을 regdate 에서 reqdate로 기준을 잡자고 장건영팀장 요청으로 변경처리, msg_group_cnt는 사용하지 않아서 주석처리 */
-		/* 2024.05.08 공급가액 은 버림처리 */
+		/* 2024.05.08 공급가액 은 버림처리 TRUNCATE(숫자, 버림할 자릿수) */
 		SELECT
 			MAX(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )) AS maxRegDate
 			, MIN(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )) AS minRegDate 
@@ -3545,6 +3545,7 @@
 			, ifnull(TRUNCATE(SUM(M.EACH_PRICE) , 0), 0) AS supplyPrice
 			, 0 AS vatPrice
 			, ifnull(TRUNCATE(SUM(M.EACH_PRICE) , 0), 0) AS totalPrice
+			, M.MSG_TYPE
 		FROM (
 			SELECT 
 				B.REGDATE
@@ -3553,6 +3554,7 @@
 				, (B.EACH_PRICE * B.MSG_GROUP_CNT) AS supplyPrice
 				, B.EACH_PRICE
 				, B.TOT_PRICE
+				, B.MSG_TYPE
 				, CASE
 					WHEN B.MSG_TYPE = '6' AND B.FILE_CNT > 0
 					THEN '그림(MMS)'
@@ -3614,17 +3616,16 @@
 		WHERE 1=1
 		AND M.RESULT IN ('W','S')
 		GROUP BY M.msgTypeName
-		ORDER BY M.orderByCode	
+		ORDER BY M.MSG_TYPE	
 	</select>
 	
 	<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 
 			, M.msgTypeName
 			, SUM(SentEA) AS ftSendCount
-			<!-- , SUM(M.MSG_GROUP_CNT) AS sendCount -->
 			, ifnull(TRUNCATE(SUM(supplyPrice) , 0), 0) AS supplyPrice
 			, 0 AS vatPrice
 			, ifnull(TRUNCATE(SUM(M.TOT_PRICE) , 0), 0) AS totalPrice