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 + , () + 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 () 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' + AND = #startDate# ]]> @@ -3378,6 +3375,8 @@ ) M + WHERE 1=1 + AND M.RESULT IN ('W','S') GROUP BY M.msgTypeName ORDER BY M.orderByCode