Commit @a400657f679be082298d4b5de10290daecb0bab7

itn 2023-06-19

알림톡 발송결과 성능개선

@a400657f679be082298d4b5de10290daecb0bab7

f02d41c

a400657

src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml


 	<!-- 전체 발송결과 조회  (그룹별)-->
 	<select id="KakaoSentDAO.selectAllKakaoSentList" parameterClass="kakaoSentVO" resultClass="kakaoSentVO">
 		SELECT
-			COUNT(M.USER_ID) OVER()               AS totMsgCnt ,
-			M.USER_ID                             AS userId ,
-			MSG_GROUP_ID                          AS msgGroupId ,
-			MSG_GROUP_CNT                         AS msgGroupCnt ,
-			SMS_TXT                               AS smsTxt ,
-			M.SUBJECT                             AS subject ,
-			DATE_FORMAT(REGDATE, '%Y-%m-%d %T')   AS regDate ,
-			DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T')  AS reqDate ,
-			DATE_FORMAT(RSLT_DATE, '%Y-%m-%d %T') AS rsltDate ,
-			CALL_FROM                             AS callFrom ,
-			CALL_TO                               AS callTo ,
-			IFNULL(ADDR_NM, '-')                  AS addrNm ,
-			TOT_PRICE                             AS totPrice ,
-			EACH_PRICE                            AS eachPrice ,
-			CUR_STATE                             AS curState ,
-			RSLT_CODE                             AS rsltCode ,
-			RSLT_CODE2                            AS rsltCode2 ,
-			IF((RSLT_CODE != '7000'),'1','0')     AS orderByrsltCode ,
-			DEL_FLAG                              AS delFlag ,
-			M.MSG_TYPE                            AS msgType ,
-			FILE_CNT                              AS fileCnt ,
-			AGENT_CODE                            AS agentCode ,
-			RESERVE_YN                            AS reserveYn ,
-			RESERVE_C_YN                          AS reserveCYn ,
-			CANCELDATE                            AS cancelDate ,
-			msgTypeName                           AS msgTypeName ,
-			orderByCode                           AS orderByCode ,
-			RESULT                                AS msgResult ,
-			successCount,
-			waitCount,
-			failCount,
-			BIZ_UMID                              AS bizUmid,
-			BL.CALL_STATUS                        AS callStatus,
-			M.BIZ_KAKAO_RESEND_YN                 AS bizKakaoResendYn,
+			M2.totMsgCnt ,
+			M2.userId ,
+			M2.msgGroupId ,
+			M2.msgGroupCnt ,
+			M2.smsTxt ,
+			M2.subject ,
+			M2.regDate ,
+			M2.reqDate ,
+			M2.rsltDate ,
+			M2.callFrom ,
+			M2.callTo ,
+			M2.addrNm ,
+			M2.totPrice ,
+			M2.eachPrice ,
+			M2.curState ,
+			M2.rsltCode ,
+			M2.rsltCode2 ,
+			M2.orderByrsltCode ,
+			M2.delFlag ,
+			M2.msgType ,
+			M2.fileCnt ,
+			M2.agentCode ,
+			M2.reserveYn ,
+			M2.reserveCYn ,
+			M2.cancelDate ,
+			M2.msgTypeName ,
+			M2.orderByCode ,
+			M2.msgResult ,
+			( SELECT COUNT(0) 
+				FROM    MJ_MSG_DATA C
+				WHERE   C.DEL_FLAG     = 'N'
+				AND     C.RESERVE_C_YN = 'N'
+				AND     C.MSG_GROUP_ID = M2.msgGroupId
+				AND     C.RSLT_CODE = '7000'
+			)	AS successCount ,
+			( SELECT COUNT(0) 
+				FROM    MJ_MSG_DATA C
+				WHERE   C.DEL_FLAG     = 'N'
+				AND     C.RESERVE_C_YN = 'N'
+				AND     C.MSG_GROUP_ID = M2.msgGroupId
+				AND     ( 
+							C.RSLT_CODE  IS NULL
+							AND C.SENT_DATE  IS NULL
+							AND C.RSLT_DATE  IS NULL
+							)
+			)	AS waitCount ,
+			( SELECT COUNT(0) 
+				FROM    MJ_MSG_DATA C
+				WHERE   C.DEL_FLAG     = 'N'
+				AND     C.RESERVE_C_YN = 'N'
+				AND     C.MSG_GROUP_ID = M2.msgGroupId
+				AND     ( 
+							C.RSLT_CODE != '7000'
+							AND C.RSLT_CODE IS NOT NULL
+						)
+			)	AS failCount ,
+			M2.bizUmid,
+			M2.callStatus,
+			M2.bizKakaoResendYn,
 			( SELECT COUNT(0)
 			FROM    BIZ_LOG BL1,
 			 MJ_MSG_DATA MMD1
-			WHERE   M.BIZ_KAKAO_RESEND_YN = 'Y'
-			AND     M.MSG_GROUP_ID        = MMD1.MSG_GROUP_ID
+			WHERE   M2.bizKakaoResendYn = 'Y'
+			AND     M2.msgGroupId        = MMD1.MSG_GROUP_ID
 			AND     MMD1.BIZ_UMID         = BL1.CMID
 			AND     (
 					 CASE

 			( SELECT COUNT(0)
 			FROM    BIZ_LOG BL1,
 			 MJ_MSG_DATA MMD1
-			WHERE   M.BIZ_KAKAO_RESEND_YN = 'Y'
-			AND     M.MSG_GROUP_ID        = MMD1.MSG_GROUP_ID
+			WHERE   M2.bizKakaoResendYn = 'Y'
+			AND     M2.msgGroupId        = MMD1.MSG_GROUP_ID
 			AND     MMD1.BIZ_UMID         = BL1.CMID
 			AND     (
 					 CASE

 						 ELSE 'F'
 					 END ) = 'F'
 			) kakaoResendFailCount
-		FROM ( 
-				SELECT MG.USER_ID ,
-				MG.MSG_GROUP_ID ,
-				MG.MSG_GROUP_CNT ,
-				MG.SMS_TXT ,
-				MG.SUBJECT ,
-				MG.REGDATE ,
-				MG.REQ_DATE ,
-				MD.RSLT_DATE ,
-				MG.CALL_FROM ,
-				MG.TOT_PRICE ,
-				MG.EACH_PRICE ,
-				MG.DEL_FLAG ,
-				MG.MSG_TYPE ,
-				MG.FILE_CNT ,
-				MG.AGENT_CODE ,
-				MG.RESERVE_YN ,
-				MG.RESERVE_C_YN ,
-				MG.CANCELDATE ,
-				MD.MSG_SEQ ,
-				MD.CALL_TO ,
-				MD.CUR_STATE ,
-				MD.RSLT_CODE ,
-				MD.RSLT_CODE2 ,
-				CASE
-					 WHEN MG.MSG_TYPE = '8'
-					 THEN '알림톡'
-					 WHEN MG.MSG_TYPE = '9'
-					 THEN '친구톡'
-				END msgTypeName ,
-				CASE
-					WHEN MG.MSG_TYPE = '8'
-					THEN '1'
-					ELSE '2'
-				END orderByCode , (
-				CASE
-					WHEN MD.RSLT_CODE = '7000'
-					THEN 'S'
-					WHEN (MD.RSLT_CODE IS NULL    AND     MD.SENT_DATE IS NULL   AND     MD.RSLT_DATE IS NULL)
-					THEN 'W'
-					ELSE 'F'
-				END ) AS result ,
-				( SELECT COUNT(0) 
-					FROM    MJ_MSG_DATA C
-					WHERE   C.DEL_FLAG     = 'N'
-					AND     C.RESERVE_C_YN = 'N'
-					AND     C.MSG_GROUP_ID = MG.MSG_GROUP_ID
-					AND     C.RSLT_CODE = '7000'
-				)	AS successCount ,
-				( SELECT COUNT(0) 
-					FROM    MJ_MSG_DATA C
-					WHERE   C.DEL_FLAG     = 'N'
-					AND     C.RESERVE_C_YN = 'N'
-					AND     C.MSG_GROUP_ID = MG.MSG_GROUP_ID
-					AND     ( 
-								C.RSLT_CODE  IS NULL
-								AND C.SENT_DATE  IS NULL
-								AND C.RSLT_DATE  IS NULL
-								)
-				)	AS waitCount ,
-				( SELECT COUNT(0) 
-					FROM    MJ_MSG_DATA C
-					WHERE   C.DEL_FLAG     = 'N'
-					AND     C.RESERVE_C_YN = 'N'
-					AND     C.MSG_GROUP_ID = MG.MSG_GROUP_ID
-					AND     ( 
-								C.RSLT_CODE != '7000'
-								AND C.RSLT_CODE IS NOT NULL
-							)
-				)	AS failCount ,
-				MSG_NOTICETALK_SENDER_KEY ,
-				MSG_NOTICETALK_TMP_KEY,
-				MD.BIZ_UMID,
-				MD.BIZ_KAKAO_RESEND_YN
-			FROM    MJ_MSG_DATA MD ,
-					MJ_MSG_GROUP_DATA MG
-			WHERE	MD.MSG_GROUP_ID = MG.MSG_GROUP_ID
-				AND IFNULL(MG.DEL_FLAG, 'N') = 'N'
-				AND MD.DEL_FLAG = 'N'
-				AND MG.USER_ID = #userId#
-				AND MG.DEL_FLAG ='N'
-				/* JSPark 2023.03.23 => 예약건중 발송완료건도 발송결과에 노출되도록 수정 */
-				/* AND MG.RESERVE_YN = 'N' */
-				<![CDATA[ AND MG.REQ_DATE <= NOW() ]]>
+		FROM (
+			SELECT
+				COUNT(M.USER_ID) OVER()               AS totMsgCnt ,
+				M.USER_ID                             AS userId ,
+				MSG_GROUP_ID                          AS msgGroupId ,
+				MSG_GROUP_CNT                         AS msgGroupCnt ,
+				SMS_TXT                               AS smsTxt ,
+				M.SUBJECT                             AS subject ,
+				DATE_FORMAT(REGDATE, '%Y-%m-%d %T')   AS regDate ,
+				DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T')  AS reqDate ,
+				DATE_FORMAT(RSLT_DATE, '%Y-%m-%d %T') AS rsltDate ,
+				CALL_FROM                             AS callFrom ,
+				CALL_TO                               AS callTo ,
+				IFNULL(ADDR_NM, '-')                  AS addrNm ,
+				TOT_PRICE                             AS totPrice ,
+				EACH_PRICE                            AS eachPrice ,
+				CUR_STATE                             AS curState ,
+				RSLT_CODE                             AS rsltCode ,
+				RSLT_CODE2                            AS rsltCode2 ,
+				IF((RSLT_CODE != '7000'),'1','0')     AS orderByrsltCode ,
+				DEL_FLAG                              AS delFlag ,
+				M.MSG_TYPE                            AS msgType ,
+				FILE_CNT                              AS fileCnt ,
+				AGENT_CODE                            AS agentCode ,
+				RESERVE_YN                            AS reserveYn ,
+				RESERVE_C_YN                          AS reserveCYn ,
+				CANCELDATE                            AS cancelDate ,
+				msgTypeName                           AS msgTypeName ,
+				orderByCode                           AS orderByCode ,
+				RESULT                                AS msgResult ,
+				BIZ_UMID                              AS bizUmid,
+				BL.CALL_STATUS                        AS callStatus,
+				M.BIZ_KAKAO_RESEND_YN                 AS bizKakaoResendYn
+			FROM ( 
+					SELECT MG.USER_ID ,
+					MG.MSG_GROUP_ID ,
+					MG.MSG_GROUP_CNT ,
+					MG.SMS_TXT ,
+					MG.SUBJECT ,
+					MG.REGDATE ,
+					MG.REQ_DATE ,
+					MD.RSLT_DATE ,
+					MG.CALL_FROM ,
+					MG.TOT_PRICE ,
+					MG.EACH_PRICE ,
+					MG.DEL_FLAG ,
+					MG.MSG_TYPE ,
+					MG.FILE_CNT ,
+					MG.AGENT_CODE ,
+					MG.RESERVE_YN ,
+					MG.RESERVE_C_YN ,
+					MG.CANCELDATE ,
+					MD.MSG_SEQ ,
+					MD.CALL_TO ,
+					MD.CUR_STATE ,
+					MD.RSLT_CODE ,
+					MD.RSLT_CODE2 ,
+					CASE
+						 WHEN MG.MSG_TYPE = '8'
+						 THEN '알림톡'
+						 WHEN MG.MSG_TYPE = '9'
+						 THEN '친구톡'
+					END msgTypeName ,
+					CASE
+						WHEN MG.MSG_TYPE = '8'
+						THEN '1'
+						ELSE '2'
+					END orderByCode , (
+					CASE
+						WHEN MD.RSLT_CODE = '7000'
+						THEN 'S'
+						WHEN (MD.RSLT_CODE IS NULL    AND     MD.SENT_DATE IS NULL   AND     MD.RSLT_DATE IS NULL)
+						THEN 'W'
+						ELSE 'F'
+					END ) AS result ,
+					MSG_NOTICETALK_SENDER_KEY ,
+					MSG_NOTICETALK_TMP_KEY,
+					MD.BIZ_UMID,
+					MD.BIZ_KAKAO_RESEND_YN
+				FROM    MJ_MSG_DATA MD ,
+						MJ_MSG_GROUP_DATA MG
+				WHERE	MD.MSG_GROUP_ID = MG.MSG_GROUP_ID
+					AND IFNULL(MG.DEL_FLAG, 'N') = 'N'
+					AND MD.DEL_FLAG = 'N'
+					AND MG.USER_ID = #userId#
+					AND MG.DEL_FLAG ='N'
+					/* JSPark 2023.03.23 => 예약건중 발송완료건도 발송결과에 노출되도록 수정 */
+					/* AND MG.RESERVE_YN = 'N' */
+					<![CDATA[ AND MG.REQ_DATE <= NOW() ]]>
+					
+				<isNotEmpty property="reserveCYn">
+					AND MG.RESERVE_C_YN = #reserveCYn#
+				</isNotEmpty>
 				
-			<isNotEmpty property="reserveCYn">
-				AND MG.RESERVE_C_YN = #reserveCYn#
-			</isNotEmpty>
-			
-			<isNotEmpty property="stateType">
-				<isEqual property="stateType" compareValue="all">
-					AND MD.CUR_STATE IN ('0','1','2','3')
-				</isEqual>
-				<isEqual property="stateType" compareValue="ready">
-					AND MD.CUR_STATE = '0'
-					AND MD.RESERVE_C_YN = 'N'
-				</isEqual>
-				<isEqual property="stateType" compareValue="complete">
-					AND MD.CUR_STATE IN ('2','3')
-					AND MD.RSLT_CODE = '7000'
-					AND	MD.RESERVE_C_YN = 'N'
-				</isEqual>
-				<isEqual property="stateType" compareValue="fail">
-					AND MD.RESERVE_C_YN = 'N'
-					AND MD.RSLT_CODE != '7000'
-				</isEqual>
-			</isNotEmpty>
-			<isNotEmpty property="tabType">
-				<isEqual property="tabType" compareValue="at">
-					AND MD.MSG_TYPE = '8'
-				</isEqual>
-				<isEqual property="tabType" compareValue="ft">
-					AND MD.MSG_TYPE = '9'
-				</isEqual>
-				<isEqual property="tabType" compareValue="all">
-					AND MD.MSG_TYPE  IN ('8','9')
-				</isEqual>
-			</isNotEmpty>
-			<isEmpty property="tabType">
-					AND MD.MSG_TYPE IN ('8','9')
-			</isEmpty>
-			
-			
-			<!-- <isEmpty property="reserveYn">
-			<![CDATA[ 
-				AND MG.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
-			]]>
-			</isEmpty> -->
-			)M
-			LEFT JOIN
-			(
-				SELECT
-					ADDR_PHONE_NO
-					, ADDR_NM
-				FROM
-					MJ_ADDR
-					WHERE 1=1
-					AND MBER_ID = #userId#
-				GROUP BY ADDR_PHONE_NO
-			)MA
-			ON M.CALL_TO = MA.ADDR_PHONE_NO
-			LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI
-			ON	M.MSG_NOTICETALK_SENDER_KEY = MKPI.SENDER_KEY
-			AND	MKPI.DELETE_YN = 'N'
-			LEFT JOIN LETTNGNRLMBER LTM
-			ON	M.USER_ID = LTM.MBER_ID
-			LEFT JOIN BIZ_LOG BL
-			ON	M.BIZ_UMID = BL.CMID
-			WHERE 1=1 
-			<isNotEmpty property="searchKeyword">
-				<isEqual property="searchCondition" compareValue="3" >
-					AND CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
-				</isEqual>
-			</isNotEmpty>
-			<isNotEmpty property="startDate">
+				<isNotEmpty property="stateType">
+					<isEqual property="stateType" compareValue="all">
+						AND MD.CUR_STATE IN ('0','1','2','3')
+					</isEqual>
+					<isEqual property="stateType" compareValue="ready">
+						AND MD.CUR_STATE = '0'
+						AND MD.RESERVE_C_YN = 'N'
+					</isEqual>
+					<isEqual property="stateType" compareValue="complete">
+						AND MD.CUR_STATE IN ('2','3')
+						AND MD.RSLT_CODE = '7000'
+						AND	MD.RESERVE_C_YN = 'N'
+					</isEqual>
+					<isEqual property="stateType" compareValue="fail">
+						AND MD.RESERVE_C_YN = 'N'
+						AND MD.RSLT_CODE != '7000'
+					</isEqual>
+				</isNotEmpty>
+				<isNotEmpty property="tabType">
+					<isEqual property="tabType" compareValue="at">
+						AND MD.MSG_TYPE = '8'
+					</isEqual>
+					<isEqual property="tabType" compareValue="ft">
+						AND MD.MSG_TYPE = '9'
+					</isEqual>
+					<isEqual property="tabType" compareValue="all">
+						AND MD.MSG_TYPE  IN ('8','9')
+					</isEqual>
+				</isNotEmpty>
+				<isEmpty property="tabType">
+						AND MD.MSG_TYPE IN ('8','9')
+				</isEmpty>
+				
+				
+				<!-- <isEmpty property="reserveYn">
 				<![CDATA[ 
-					AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
+					AND MG.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
 				]]>
+				</isEmpty> -->
+				)M
+				LEFT JOIN
+				(
+					SELECT
+						ADDR_PHONE_NO
+						, ADDR_NM
+					FROM
+						MJ_ADDR
+						WHERE 1=1
+						AND MBER_ID = #userId#
+					GROUP BY ADDR_PHONE_NO
+				)MA
+				ON M.CALL_TO = MA.ADDR_PHONE_NO
+				LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI
+				ON	M.MSG_NOTICETALK_SENDER_KEY = MKPI.SENDER_KEY
+				AND	MKPI.DELETE_YN = 'N'
+				LEFT JOIN LETTNGNRLMBER LTM
+				ON	M.USER_ID = LTM.MBER_ID
+				LEFT JOIN BIZ_LOG BL
+				ON	M.BIZ_UMID = BL.CMID
+				WHERE 1=1 
+				<isNotEmpty property="searchKeyword">
+					<isEqual property="searchCondition" compareValue="3" >
+						AND CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
+					</isEqual>
+				</isNotEmpty>
+				<isNotEmpty property="startDate">
+					<![CDATA[ 
+						AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
+					]]>
+				</isNotEmpty>
+				<isNotEmpty property="endDate">
+					<![CDATA[ 
+						AND 	DATE_FORMAT(REGDATE, '%Y-%m-%d')  <=  DATE_FORMAT(#endDate#, '%Y-%m-%d')  
+					]]>
+				</isNotEmpty>
+			GROUP BY MSG_GROUP_ID
+			ORDER BY 1=1
+			<isNotEmpty property="searchSortCnd">
+				<isEqual property="searchSortCnd" compareValue="curState">
+					, curState  $searchSortOrd$
+					, orderByrsltCode
+				</isEqual>
+				<isNotEqual  property="searchSortCnd" compareValue="curState">
+					,$searchSortCnd$
+				</isNotEqual>
 			</isNotEmpty>
-			<isNotEmpty property="endDate">
-				<![CDATA[ 
-					AND 	DATE_FORMAT(REGDATE, '%Y-%m-%d')  <=  DATE_FORMAT(#endDate#, '%Y-%m-%d')  
-				]]>
+			<isNotEmpty property="searchSortOrd">
+				$searchSortOrd$
 			</isNotEmpty>
-		GROUP BY MSG_GROUP_ID
-		ORDER BY 1=1
-		<isNotEmpty property="searchSortCnd">
-			<isEqual property="searchSortCnd" compareValue="curState">
-				, curState  $searchSortOrd$
-				, orderByrsltCode
-			</isEqual>
-			<isNotEqual  property="searchSortCnd" compareValue="curState">
-				,$searchSortCnd$
-			</isNotEqual>
-		</isNotEmpty>
-		<isNotEmpty property="searchSortOrd">
-			$searchSortOrd$
-		</isNotEmpty>
-		LIMIT  #recordCountPerPage# OFFSET #firstIndex#	
+			LIMIT  #recordCountPerPage# OFFSET #firstIndex#	
+		) M2			
 	</select>
 	
 	

f02d41c

a400657

src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp


 		<table class="tType4">
 			<colgroup>
 				<col style="width: 40px;">
-				<col style="width: 16%;">
-				<col style="width: 12%;">
+				<col style="width: 14%;">
+				<col style="width: 7%;">
 				<col style="width: 10%;">
+				<col style="width: 18%;">
 				<col style="width: 12%;">
-				<col style="width: 13%;">
 				<col style="width: 10%;">
 				<col style="width: 12%;">
 				<col style="width: 7%;">

Add a comment

Open 0
Closed 0

List

...	...	@@ -77,11 +77,11 @@
77	77	<table class="tType4">
78	78	<colgroup>
79	79	<col style="width: 40px;">
80		- <col style="width: 16%;">
81		- <col style="width: 12%;">
	80	+ <col style="width: 14%;">
	81	+ <col style="width: 7%;">
82	82	<col style="width: 10%;">
	83	+ <col style="width: 18%;">
83	84	<col style="width: 12%;">
84		- <col style="width: 13%;">
85	85	<col style="width: 10%;">
86	86	<col style="width: 12%;">
87	87	<col style="width: 7%;">

...	...	@@ -202,45 +202,70 @@
202	202	<!-- 전체 발송결과 조회 (그룹별)-->
203	203	<select id="KakaoSentDAO.selectAllKakaoSentList" parameterClass="kakaoSentVO" resultClass="kakaoSentVO">
204	204	SELECT
205		- COUNT(M.USER_ID) OVER() AS totMsgCnt ,
206		- M.USER_ID AS userId ,
207		- MSG_GROUP_ID AS msgGroupId ,
208		- MSG_GROUP_CNT AS msgGroupCnt ,
209		- SMS_TXT AS smsTxt ,
210		- M.SUBJECT AS subject ,
211		- DATE_FORMAT(REGDATE, '%Y-%m-%d %T') AS regDate ,
212		- DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqDate ,
213		- DATE_FORMAT(RSLT_DATE, '%Y-%m-%d %T') AS rsltDate ,
214		- CALL_FROM AS callFrom ,
215		- CALL_TO AS callTo ,
216		- IFNULL(ADDR_NM, '-') AS addrNm ,
217		- TOT_PRICE AS totPrice ,
218		- EACH_PRICE AS eachPrice ,
219		- CUR_STATE AS curState ,
220		- RSLT_CODE AS rsltCode ,
221		- RSLT_CODE2 AS rsltCode2 ,
222		- IF((RSLT_CODE != '7000'),'1','0') AS orderByrsltCode ,
223		- DEL_FLAG AS delFlag ,
224		- M.MSG_TYPE AS msgType ,
225		- FILE_CNT AS fileCnt ,
226		- AGENT_CODE AS agentCode ,
227		- RESERVE_YN AS reserveYn ,
228		- RESERVE_C_YN AS reserveCYn ,
229		- CANCELDATE AS cancelDate ,
230		- msgTypeName AS msgTypeName ,
231		- orderByCode AS orderByCode ,
232		- RESULT AS msgResult ,
233		- successCount,
234		- waitCount,
235		- failCount,
236		- BIZ_UMID AS bizUmid,
237		- BL.CALL_STATUS AS callStatus,
238		- M.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn,
	205	+ M2.totMsgCnt ,
	206	+ M2.userId ,
	207	+ M2.msgGroupId ,
	208	+ M2.msgGroupCnt ,
	209	+ M2.smsTxt ,
	210	+ M2.subject ,
	211	+ M2.regDate ,
	212	+ M2.reqDate ,
	213	+ M2.rsltDate ,
	214	+ M2.callFrom ,
	215	+ M2.callTo ,
	216	+ M2.addrNm ,
	217	+ M2.totPrice ,
	218	+ M2.eachPrice ,
	219	+ M2.curState ,
	220	+ M2.rsltCode ,
	221	+ M2.rsltCode2 ,
	222	+ M2.orderByrsltCode ,
	223	+ M2.delFlag ,
	224	+ M2.msgType ,
	225	+ M2.fileCnt ,
	226	+ M2.agentCode ,
	227	+ M2.reserveYn ,
	228	+ M2.reserveCYn ,
	229	+ M2.cancelDate ,
	230	+ M2.msgTypeName ,
	231	+ M2.orderByCode ,
	232	+ M2.msgResult ,
	233	+ ( SELECT COUNT(0)
	234	+ FROM MJ_MSG_DATA C
	235	+ WHERE C.DEL_FLAG = 'N'
	236	+ AND C.RESERVE_C_YN = 'N'
	237	+ AND C.MSG_GROUP_ID = M2.msgGroupId
	238	+ AND C.RSLT_CODE = '7000'
	239	+ ) AS successCount ,
	240	+ ( SELECT COUNT(0)
	241	+ FROM MJ_MSG_DATA C
	242	+ WHERE C.DEL_FLAG = 'N'
	243	+ AND C.RESERVE_C_YN = 'N'
	244	+ AND C.MSG_GROUP_ID = M2.msgGroupId
	245	+ AND (
	246	+ C.RSLT_CODE IS NULL
	247	+ AND C.SENT_DATE IS NULL
	248	+ AND C.RSLT_DATE IS NULL
	249	+ )
	250	+ ) AS waitCount ,
	251	+ ( SELECT COUNT(0)
	252	+ FROM MJ_MSG_DATA C
	253	+ WHERE C.DEL_FLAG = 'N'
	254	+ AND C.RESERVE_C_YN = 'N'
	255	+ AND C.MSG_GROUP_ID = M2.msgGroupId
	256	+ AND (
	257	+ C.RSLT_CODE != '7000'
	258	+ AND C.RSLT_CODE IS NOT NULL
	259	+ )
	260	+ ) AS failCount ,
	261	+ M2.bizUmid,
	262	+ M2.callStatus,
	263	+ M2.bizKakaoResendYn,
239	264	( SELECT COUNT(0)
240	265	FROM BIZ_LOG BL1,
241	266	MJ_MSG_DATA MMD1
242		- WHERE M.BIZ_KAKAO_RESEND_YN = 'Y'
243		- AND M.MSG_GROUP_ID = MMD1.MSG_GROUP_ID
	267	+ WHERE M2.bizKakaoResendYn = 'Y'
	268	+ AND M2.msgGroupId = MMD1.MSG_GROUP_ID
244	269	AND MMD1.BIZ_UMID = BL1.CMID
245	270	AND (
246	271	CASE
...	...	@@ -252,8 +277,8 @@
252	277	( SELECT COUNT(0)
253	278	FROM BIZ_LOG BL1,
254	279	MJ_MSG_DATA MMD1
255		- WHERE M.BIZ_KAKAO_RESEND_YN = 'Y'
256		- AND M.MSG_GROUP_ID = MMD1.MSG_GROUP_ID
	280	+ WHERE M2.bizKakaoResendYn = 'Y'
	281	+ AND M2.msgGroupId = MMD1.MSG_GROUP_ID
257	282	AND MMD1.BIZ_UMID = BL1.CMID
258	283	AND (
259	284	CASE
...	...	@@ -262,185 +287,191 @@
262	287	ELSE 'F'
263	288	END ) = 'F'
264	289	) kakaoResendFailCount
265		- FROM (
266		- SELECT MG.USER_ID ,
267		- MG.MSG_GROUP_ID ,
268		- MG.MSG_GROUP_CNT ,
269		- MG.SMS_TXT ,
270		- MG.SUBJECT ,
271		- MG.REGDATE ,
272		- MG.REQ_DATE ,
273		- MD.RSLT_DATE ,
274		- MG.CALL_FROM ,
275		- MG.TOT_PRICE ,
276		- MG.EACH_PRICE ,
277		- MG.DEL_FLAG ,
278		- MG.MSG_TYPE ,
279		- MG.FILE_CNT ,
280		- MG.AGENT_CODE ,
281		- MG.RESERVE_YN ,
282		- MG.RESERVE_C_YN ,
283		- MG.CANCELDATE ,
284		- MD.MSG_SEQ ,
285		- MD.CALL_TO ,
286		- MD.CUR_STATE ,
287		- MD.RSLT_CODE ,
288		- MD.RSLT_CODE2 ,
289		- CASE
290		- WHEN MG.MSG_TYPE = '8'
291		- THEN '알림톡'
292		- WHEN MG.MSG_TYPE = '9'
293		- THEN '친구톡'
294		- END msgTypeName ,
295		- CASE
296		- WHEN MG.MSG_TYPE = '8'
297		- THEN '1'
298		- ELSE '2'
299		- END orderByCode , (
300		- CASE
301		- WHEN MD.RSLT_CODE = '7000'
302		- THEN 'S'
303		- WHEN (MD.RSLT_CODE IS NULL AND MD.SENT_DATE IS NULL AND MD.RSLT_DATE IS NULL)
304		- THEN 'W'
305		- ELSE 'F'
306		- END ) AS result ,
307		- ( SELECT COUNT(0)
308		- FROM MJ_MSG_DATA C
309		- WHERE C.DEL_FLAG = 'N'
310		- AND C.RESERVE_C_YN = 'N'
311		- AND C.MSG_GROUP_ID = MG.MSG_GROUP_ID
312		- AND C.RSLT_CODE = '7000'
313		- ) AS successCount ,
314		- ( SELECT COUNT(0)
315		- FROM MJ_MSG_DATA C
316		- WHERE C.DEL_FLAG = 'N'
317		- AND C.RESERVE_C_YN = 'N'
318		- AND C.MSG_GROUP_ID = MG.MSG_GROUP_ID
319		- AND (
320		- C.RSLT_CODE IS NULL
321		- AND C.SENT_DATE IS NULL
322		- AND C.RSLT_DATE IS NULL
323		- )
324		- ) AS waitCount ,
325		- ( SELECT COUNT(0)
326		- FROM MJ_MSG_DATA C
327		- WHERE C.DEL_FLAG = 'N'
328		- AND C.RESERVE_C_YN = 'N'
329		- AND C.MSG_GROUP_ID = MG.MSG_GROUP_ID
330		- AND (
331		- C.RSLT_CODE != '7000'
332		- AND C.RSLT_CODE IS NOT NULL
333		- )
334		- ) AS failCount ,
335		- MSG_NOTICETALK_SENDER_KEY ,
336		- MSG_NOTICETALK_TMP_KEY,
337		- MD.BIZ_UMID,
338		- MD.BIZ_KAKAO_RESEND_YN
339		- FROM MJ_MSG_DATA MD ,
340		- MJ_MSG_GROUP_DATA MG
341		- WHERE MD.MSG_GROUP_ID = MG.MSG_GROUP_ID
342		- AND IFNULL(MG.DEL_FLAG, 'N') = 'N'
343		- AND MD.DEL_FLAG = 'N'
344		- AND MG.USER_ID = #userId#
345		- AND MG.DEL_FLAG ='N'
346		- /* JSPark 2023.03.23 => 예약건중 발송완료건도 발송결과에 노출되도록 수정 */
347		- /* AND MG.RESERVE_YN = 'N' */
348		- <![CDATA[ AND MG.REQ_DATE <= NOW() ]]>
	290	+ FROM (
	291	+ SELECT
	292	+ COUNT(M.USER_ID) OVER() AS totMsgCnt ,
	293	+ M.USER_ID AS userId ,
	294	+ MSG_GROUP_ID AS msgGroupId ,
	295	+ MSG_GROUP_CNT AS msgGroupCnt ,
	296	+ SMS_TXT AS smsTxt ,
	297	+ M.SUBJECT AS subject ,
	298	+ DATE_FORMAT(REGDATE, '%Y-%m-%d %T') AS regDate ,
	299	+ DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqDate ,
	300	+ DATE_FORMAT(RSLT_DATE, '%Y-%m-%d %T') AS rsltDate ,
	301	+ CALL_FROM AS callFrom ,
	302	+ CALL_TO AS callTo ,
	303	+ IFNULL(ADDR_NM, '-') AS addrNm ,
	304	+ TOT_PRICE AS totPrice ,
	305	+ EACH_PRICE AS eachPrice ,
	306	+ CUR_STATE AS curState ,
	307	+ RSLT_CODE AS rsltCode ,
	308	+ RSLT_CODE2 AS rsltCode2 ,
	309	+ IF((RSLT_CODE != '7000'),'1','0') AS orderByrsltCode ,
	310	+ DEL_FLAG AS delFlag ,
	311	+ M.MSG_TYPE AS msgType ,
	312	+ FILE_CNT AS fileCnt ,
	313	+ AGENT_CODE AS agentCode ,
	314	+ RESERVE_YN AS reserveYn ,
	315	+ RESERVE_C_YN AS reserveCYn ,
	316	+ CANCELDATE AS cancelDate ,
	317	+ msgTypeName AS msgTypeName ,
	318	+ orderByCode AS orderByCode ,
	319	+ RESULT AS msgResult ,
	320	+ BIZ_UMID AS bizUmid,
	321	+ BL.CALL_STATUS AS callStatus,
	322	+ M.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn
	323	+ FROM (
	324	+ SELECT MG.USER_ID ,
	325	+ MG.MSG_GROUP_ID ,
	326	+ MG.MSG_GROUP_CNT ,
	327	+ MG.SMS_TXT ,
	328	+ MG.SUBJECT ,
	329	+ MG.REGDATE ,
	330	+ MG.REQ_DATE ,
	331	+ MD.RSLT_DATE ,
	332	+ MG.CALL_FROM ,
	333	+ MG.TOT_PRICE ,
	334	+ MG.EACH_PRICE ,
	335	+ MG.DEL_FLAG ,
	336	+ MG.MSG_TYPE ,
	337	+ MG.FILE_CNT ,
	338	+ MG.AGENT_CODE ,
	339	+ MG.RESERVE_YN ,
	340	+ MG.RESERVE_C_YN ,
	341	+ MG.CANCELDATE ,
	342	+ MD.MSG_SEQ ,
	343	+ MD.CALL_TO ,
	344	+ MD.CUR_STATE ,
	345	+ MD.RSLT_CODE ,
	346	+ MD.RSLT_CODE2 ,
	347	+ CASE
	348	+ WHEN MG.MSG_TYPE = '8'
	349	+ THEN '알림톡'
	350	+ WHEN MG.MSG_TYPE = '9'
	351	+ THEN '친구톡'
	352	+ END msgTypeName ,
	353	+ CASE
	354	+ WHEN MG.MSG_TYPE = '8'
	355	+ THEN '1'
	356	+ ELSE '2'
	357	+ END orderByCode , (
	358	+ CASE
	359	+ WHEN MD.RSLT_CODE = '7000'
	360	+ THEN 'S'
	361	+ WHEN (MD.RSLT_CODE IS NULL AND MD.SENT_DATE IS NULL AND MD.RSLT_DATE IS NULL)
	362	+ THEN 'W'
	363	+ ELSE 'F'
	364	+ END ) AS result ,
	365	+ MSG_NOTICETALK_SENDER_KEY ,
	366	+ MSG_NOTICETALK_TMP_KEY,
	367	+ MD.BIZ_UMID,
	368	+ MD.BIZ_KAKAO_RESEND_YN
	369	+ FROM MJ_MSG_DATA MD ,
	370	+ MJ_MSG_GROUP_DATA MG
	371	+ WHERE MD.MSG_GROUP_ID = MG.MSG_GROUP_ID
	372	+ AND IFNULL(MG.DEL_FLAG, 'N') = 'N'
	373	+ AND MD.DEL_FLAG = 'N'
	374	+ AND MG.USER_ID = #userId#
	375	+ AND MG.DEL_FLAG ='N'
	376	+ /* JSPark 2023.03.23 => 예약건중 발송완료건도 발송결과에 노출되도록 수정 */
	377	+ /* AND MG.RESERVE_YN = 'N' */
	378	+ <![CDATA[ AND MG.REQ_DATE <= NOW() ]]>
	379	+
	380	+ <isNotEmpty property="reserveCYn">
	381	+ AND MG.RESERVE_C_YN = #reserveCYn#
	382	+ </isNotEmpty>
349	383
350		- <isNotEmpty property="reserveCYn">
351		- AND MG.RESERVE_C_YN = #reserveCYn#
352		- </isNotEmpty>
353		-
354		- <isNotEmpty property="stateType">
355		- <isEqual property="stateType" compareValue="all">
356		- AND MD.CUR_STATE IN ('0','1','2','3')
357		- </isEqual>
358		- <isEqual property="stateType" compareValue="ready">
359		- AND MD.CUR_STATE = '0'
360		- AND MD.RESERVE_C_YN = 'N'
361		- </isEqual>
362		- <isEqual property="stateType" compareValue="complete">
363		- AND MD.CUR_STATE IN ('2','3')
364		- AND MD.RSLT_CODE = '7000'
365		- AND MD.RESERVE_C_YN = 'N'
366		- </isEqual>
367		- <isEqual property="stateType" compareValue="fail">
368		- AND MD.RESERVE_C_YN = 'N'
369		- AND MD.RSLT_CODE != '7000'
370		- </isEqual>
371		- </isNotEmpty>
372		- <isNotEmpty property="tabType">
373		- <isEqual property="tabType" compareValue="at">
374		- AND MD.MSG_TYPE = '8'
375		- </isEqual>
376		- <isEqual property="tabType" compareValue="ft">
377		- AND MD.MSG_TYPE = '9'
378		- </isEqual>
379		- <isEqual property="tabType" compareValue="all">
380		- AND MD.MSG_TYPE IN ('8','9')
381		- </isEqual>
382		- </isNotEmpty>
383		- <isEmpty property="tabType">
384		- AND MD.MSG_TYPE IN ('8','9')
385		- </isEmpty>
386		-
387		-
388		- <!-- <isEmpty property="reserveYn">
389		- <![CDATA[
390		- AND MG.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
391		- ]]>
392		- </isEmpty> -->
393		- )M
394		- LEFT JOIN
395		- (
396		- SELECT
397		- ADDR_PHONE_NO
398		- , ADDR_NM
399		- FROM
400		- MJ_ADDR
401		- WHERE 1=1
402		- AND MBER_ID = #userId#
403		- GROUP BY ADDR_PHONE_NO
404		- )MA
405		- ON M.CALL_TO = MA.ADDR_PHONE_NO
406		- LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI
407		- ON M.MSG_NOTICETALK_SENDER_KEY = MKPI.SENDER_KEY
408		- AND MKPI.DELETE_YN = 'N'
409		- LEFT JOIN LETTNGNRLMBER LTM
410		- ON M.USER_ID = LTM.MBER_ID
411		- LEFT JOIN BIZ_LOG BL
412		- ON M.BIZ_UMID = BL.CMID
413		- WHERE 1=1
414		- <isNotEmpty property="searchKeyword">
415		- <isEqual property="searchCondition" compareValue="3" >
416		- AND CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
417		- </isEqual>
418		- </isNotEmpty>
419		- <isNotEmpty property="startDate">
	384	+ <isNotEmpty property="stateType">
	385	+ <isEqual property="stateType" compareValue="all">
	386	+ AND MD.CUR_STATE IN ('0','1','2','3')
	387	+ </isEqual>
	388	+ <isEqual property="stateType" compareValue="ready">
	389	+ AND MD.CUR_STATE = '0'
	390	+ AND MD.RESERVE_C_YN = 'N'
	391	+ </isEqual>
	392	+ <isEqual property="stateType" compareValue="complete">
	393	+ AND MD.CUR_STATE IN ('2','3')
	394	+ AND MD.RSLT_CODE = '7000'
	395	+ AND MD.RESERVE_C_YN = 'N'
	396	+ </isEqual>
	397	+ <isEqual property="stateType" compareValue="fail">
	398	+ AND MD.RESERVE_C_YN = 'N'
	399	+ AND MD.RSLT_CODE != '7000'
	400	+ </isEqual>
	401	+ </isNotEmpty>
	402	+ <isNotEmpty property="tabType">
	403	+ <isEqual property="tabType" compareValue="at">
	404	+ AND MD.MSG_TYPE = '8'
	405	+ </isEqual>
	406	+ <isEqual property="tabType" compareValue="ft">
	407	+ AND MD.MSG_TYPE = '9'
	408	+ </isEqual>
	409	+ <isEqual property="tabType" compareValue="all">
	410	+ AND MD.MSG_TYPE IN ('8','9')
	411	+ </isEqual>
	412	+ </isNotEmpty>
	413	+ <isEmpty property="tabType">
	414	+ AND MD.MSG_TYPE IN ('8','9')
	415	+ </isEmpty>
	416	+
	417	+
	418	+ <!-- <isEmpty property="reserveYn">
420	419	<![CDATA[
421		- AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
	420	+ AND MG.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
422	421	]]>
	422	+ </isEmpty> -->
	423	+ )M
	424	+ LEFT JOIN
	425	+ (
	426	+ SELECT
	427	+ ADDR_PHONE_NO
	428	+ , ADDR_NM
	429	+ FROM
	430	+ MJ_ADDR
	431	+ WHERE 1=1
	432	+ AND MBER_ID = #userId#
	433	+ GROUP BY ADDR_PHONE_NO
	434	+ )MA
	435	+ ON M.CALL_TO = MA.ADDR_PHONE_NO
	436	+ LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI
	437	+ ON M.MSG_NOTICETALK_SENDER_KEY = MKPI.SENDER_KEY
	438	+ AND MKPI.DELETE_YN = 'N'
	439	+ LEFT JOIN LETTNGNRLMBER LTM
	440	+ ON M.USER_ID = LTM.MBER_ID
	441	+ LEFT JOIN BIZ_LOG BL
	442	+ ON M.BIZ_UMID = BL.CMID
	443	+ WHERE 1=1
	444	+ <isNotEmpty property="searchKeyword">
	445	+ <isEqual property="searchCondition" compareValue="3" >
	446	+ AND CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
	447	+ </isEqual>
	448	+ </isNotEmpty>
	449	+ <isNotEmpty property="startDate">
	450	+ <![CDATA[
	451	+ AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
	452	+ ]]>
	453	+ </isNotEmpty>
	454	+ <isNotEmpty property="endDate">
	455	+ <![CDATA[
	456	+ AND DATE_FORMAT(REGDATE, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d')
	457	+ ]]>
	458	+ </isNotEmpty>
	459	+ GROUP BY MSG_GROUP_ID
	460	+ ORDER BY 1=1
	461	+ <isNotEmpty property="searchSortCnd">
	462	+ <isEqual property="searchSortCnd" compareValue="curState">
	463	+ , curState $searchSortOrd$
	464	+ , orderByrsltCode
	465	+ </isEqual>
	466	+ <isNotEqual property="searchSortCnd" compareValue="curState">
	467	+ ,$searchSortCnd$
	468	+ </isNotEqual>
423	469	</isNotEmpty>
424		- <isNotEmpty property="endDate">
425		- <![CDATA[
426		- AND DATE_FORMAT(REGDATE, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d')
427		- ]]>
	470	+ <isNotEmpty property="searchSortOrd">
	471	+ $searchSortOrd$
428	472	</isNotEmpty>
429		- GROUP BY MSG_GROUP_ID
430		- ORDER BY 1=1
431		- <isNotEmpty property="searchSortCnd">
432		- <isEqual property="searchSortCnd" compareValue="curState">
433		- , curState $searchSortOrd$
434		- , orderByrsltCode
435		- </isEqual>
436		- <isNotEqual property="searchSortCnd" compareValue="curState">
437		- ,$searchSortCnd$
438		- </isNotEqual>
439		- </isNotEmpty>
440		- <isNotEmpty property="searchSortOrd">
441		- $searchSortOrd$
442		- </isNotEmpty>
443		- LIMIT #recordCountPerPage# OFFSET #firstIndex#
	473	+ LIMIT #recordCountPerPage# OFFSET #firstIndex#
	474	+ ) M2
444	475	</select>
445	476
446	477

Delete comment