From 95b7785445950893023a57ebc8b83328402272d4 Mon Sep 17 00:00:00 2001
From: wyh <mail>
Date: Thu, 7 Dec 2023 12:14:52 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EB=82=B4=EC=97=AD=EC=84=9C,?=
 =?UTF-8?q?=20=EA=B1=B0=EB=9E=98=EB=AA=85=EC=84=B8=EC=84=9C=20=ED=8C=9D?=
 =?UTF-8?q?=EC=97=85=20=EA=B1=B0=EB=9E=98=20=EA=B8=88=EC=95=A1=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EC=BF=BC=EB=A6=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/let/msg/MjonMsgData_SQL_mysql.xml  | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 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 95074c6b..6512f3bb 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
@@ -3307,9 +3307,9 @@
 			, M.msgTypeName
 			, M.orderByCode
 			, SUM(M.MSG_GROUP_CNT) AS sendCount
-			, SUM(M.supplyPrice) AS supplyPrice
+			, ifnull(ROUND(SUM(M.EACH_PRICE) , 2), 0) AS supplyPrice
 			, 0 AS vatPrice
-			, SUM(M.supplyPrice) AS totalPrice 
+			, ifnull(ROUND(SUM(M.EACH_PRICE) , 2), 0) AS totalPrice
 		FROM (
 			SELECT 
 				B.REGDATE
@@ -3335,22 +3335,19 @@
 					THEN '2'
 					ELSE '1'
 				END orderByCode
+				, (<include refid="MjonMsgSentDAO.selectAgentResultQuery_A"/>)
+				AS RESULT
 			FROM 
-				MJ_MSG_GROUP_DATA B
-			WHERE
-				B.USER_ID = #userId#
-				AND B.DEL_FLAG = 'N'
-				AND B.MSG_GROUP_ID IN 
-				(
-					SELECT 
-						A.MSG_GROUP_ID
-					FROM
-						MJ_MSG_DATA A
-					WHERE
-						IFNULL(A.DEL_FLAG,'N') = 'N'
-						AND A.RESERVE_C_YN = 'N'
-						AND (<include refid="MjonMsgSentDAO.selectAgentResultQuery_A"/>) IN ('W','S')
-				)
+				MJ_MSG_DATA A
+				, MJ_MSG_GROUP_DATA B
+			WHERE 1=1
+				AND A.MSG_GROUP_ID = B.MSG_GROUP_ID
+				AND A.USER_ID				= #userId#
+				AND B.USER_ID				= #userId#
+				AND B.DEL_FLAG				= 'N'
+				AND IFNULL(B.DEL_FLAG,'N')	= 'N'
+				AND B.RESERVE_C_YN			= 'N'
+				
 			<isNotEmpty property="startDate">
 				AND <![CDATA[ B.REQ_DATE  >=   #startDate# ]]>
 			</isNotEmpty>
@@ -3378,6 +3375,8 @@
 				</isEqual>
 			</isNotEmpty>
 		) M
+		WHERE 1=1
+		AND M.RESULT IN ('W','S')
 		GROUP BY M.msgTypeName
 		ORDER BY M.orderByCode	
 	</select>