Commit @95b7785445950893023a57ebc8b83328402272d4

wyh 2023-12-07

사용내역서, 거래명세서 팝업 거래 금액 조회 쿼리 수정

@95b7785445950893023a57ebc8b83328402272d4

83b0a90

95b7785

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


 			, 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

 					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>

 				</isEqual>
 			</isNotEmpty>
 		) M
+		WHERE 1=1
+		AND M.RESULT IN ('W','S')
 		GROUP BY M.msgTypeName
 		ORDER BY M.orderByCode	
 	</select>

Add a comment

Open 0
Closed 0

List

...	...	@@ -3307,9 +3307,9 @@
3307	3307	, M.msgTypeName
3308	3308	, M.orderByCode
3309	3309	, SUM(M.MSG_GROUP_CNT) AS sendCount
3310		- , SUM(M.supplyPrice) AS supplyPrice
	3310	+ , ifnull(ROUND(SUM(M.EACH_PRICE) , 2), 0) AS supplyPrice
3311	3311	, 0 AS vatPrice
3312		- , SUM(M.supplyPrice) AS totalPrice
	3312	+ , ifnull(ROUND(SUM(M.EACH_PRICE) , 2), 0) AS totalPrice
3313	3313	FROM (
3314	3314	SELECT
3315	3315	B.REGDATE
...	...	@@ -3335,22 +3335,19 @@
3335	3335	THEN '2'
3336	3336	ELSE '1'
3337	3337	END orderByCode
	3338	+ , (<include refid="MjonMsgSentDAO.selectAgentResultQuery_A"/>)
	3339	+ AS RESULT
3338	3340	FROM
3339		- MJ_MSG_GROUP_DATA B
3340		- WHERE
3341		- B.USER_ID = #userId#
3342		- AND B.DEL_FLAG = 'N'
3343		- AND B.MSG_GROUP_ID IN
3344		- (
3345		- SELECT
3346		- A.MSG_GROUP_ID
3347		- FROM
3348		- MJ_MSG_DATA A
3349		- WHERE
3350		- IFNULL(A.DEL_FLAG,'N') = 'N'
3351		- AND A.RESERVE_C_YN = 'N'
3352		- AND (<include refid="MjonMsgSentDAO.selectAgentResultQuery_A"/>) IN ('W','S')
3353		- )
	3341	+ MJ_MSG_DATA A
	3342	+ , MJ_MSG_GROUP_DATA B
	3343	+ WHERE 1=1
	3344	+ AND A.MSG_GROUP_ID = B.MSG_GROUP_ID
	3345	+ AND A.USER_ID = #userId#
	3346	+ AND B.USER_ID = #userId#
	3347	+ AND B.DEL_FLAG = 'N'
	3348	+ AND IFNULL(B.DEL_FLAG,'N') = 'N'
	3349	+ AND B.RESERVE_C_YN = 'N'
	3350	+
3354	3351	<isNotEmpty property="startDate">
3355	3352	AND <![CDATA[ B.REQ_DATE >= #startDate# ]]>
3356	3353	</isNotEmpty>
...	...	@@ -3378,6 +3375,8 @@
3378	3375	</isEqual>
3379	3376	</isNotEmpty>
3380	3377	) M
	3378	+ WHERE 1=1
	3379	+ AND M.RESULT IN ('W','S')
3381	3380	GROUP BY M.msgTypeName
3382	3381	ORDER BY M.orderByCode
3383	3382	</select>

Delete comment