Merge branch 'jiwoo'

This commit is contained in:
JIWOO 2025-06-11 18:34:14 +09:00
commit b5b1200b39

View File

@ -2406,8 +2406,118 @@
reqDate DESC
,sentDate DESC
</select>
<select id="mjonKakaoATDAO.selectMjonKakaoATGroupCompleteByUserList_advc" parameterClass="kakaoVO" resultClass="kakaoVO">
SELECT
COUNT(MMGD.USER_ID) OVER() AS totCnt,
MMGD.USER_ID AS userId,
MMGD.MSG_GROUP_ID AS msgGroupId,
MMGD.MSG_GROUP_CNT AS msgGroupCnt,
MMGD.AT_DELAY_YN AS atDelayYn,
MMGD.AT_DELAY_COMPLETE_YN AS atDelayCompleteYn,
MMGD.CANCELDATE AS cancelDate,
MMGD.REQ_DATE AS reqDate,
MMGD.REGDATE AS regDate,
MMGD.RESERVE_YN AS reserveYn,
MMGD.RESERVE_C_YN AS reserveCYn,
MMGD.SMS_TXT AS smsTxt,
MMGD.MSG_TYPE AS msgType,
CASE
WHEN MMGD.MSG_TYPE = '8' then '알림톡'
WHEN MMGD.MSG_TYPE = '9' then '친구톡'
END msgTypeName,
l.MBER_NM AS userNm,
l.AT_SMISHING_YN AS atSmishingYn,
l.VIP_YN AS vipYn,
IFNULL(MD.successCount, 0) as successCount,
MKPI.YELLOW_ID AS yellowId
FROM
mj_msg_group_data MMGD
LEFT JOIN lettngnrlmber l
ON l.MBER_ID = MMGD.USER_ID
LEFT JOIN (
SELECT
MSG_GROUP_ID,
SUM(case when RSLT_CODE = '7000' then 1 else 0 end) as successCount,
MAX(MSG_NOTICETALK_SENDER_KEY) as MSG_NOTICETALK_SENDER_KEY
FROM
MJ_MSG_DATA
GROUP BY
MSG_GROUP_ID
) MD
ON MD.MSG_GROUP_ID = MMGD.MSG_GROUP_ID
LEFT JOIN mj_kakao_profile_info MKPI
ON MKPI.SENDER_KEY = MD.MSG_NOTICETALK_SENDER_KEY
AND MKPI.USER_ID = MMGD.USER_ID
WHERE
<![CDATA[
CASE
WHEN RESERVE_YN = 'N'
THEN (MMGD.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE))
WHEN RESERVE_YN = 'Y'
THEN (MMGD.REQ_DATE <= NOW() OR (MMGD.AT_DELAY_YN = 'Y' AND MMGD.AT_DELAY_COMPLETE_YN = 'N'))
END
]]>
AND MMGD.RESERVE_C_YN = 'N'
<isEqual property="searchCondition2" compareValue="N">
AND IFNULL(MMGD.RESERVE_YN, 'N') = 'N'
</isEqual>
<isEqual property="searchCondition2" compareValue="Y">
AND IFNULL(MMGD.RESERVE_YN, 'N') = 'Y'
</isEqual>
<isEmpty property="msgType">
AND MMGD.MSG_TYPE IN ('8' ,'9')
</isEmpty>
<isEqual property="msgType" compareValue="8">
AND MMGD.MSG_TYPE = '8'
</isEqual>
<isEqual property="msgType" compareValue="9">
AND MMGD.MSG_TYPE = '9'
</isEqual>
<isNotEmpty property="ntceBgnde">
AND MMGD.REQ_DATE >= #ntceBgnde#
</isNotEmpty>
<isNotEmpty property="ntceEndde">
<![CDATA[
AND MMGD.REQ_DATE < DATE_ADD(#ntceEndde#, INTERVAL 1 DAY)
]]>
</isNotEmpty>
<isNotEmpty property="searchKeyword">
<isEqual property="searchCondition" compareValue="" >
AND (
MMGD.USER_ID LIKE CONCAT('%', #searchKeyword#, '%')
OR MKPI.YELLOW_ID LIKE CONCAT ('%', #searchKeyword#,'%')
OR MMGD.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%')
)
</isEqual>
<isEqual property="searchCondition" compareValue="1">
AND MMGD.USER_ID LIKE CONCAT('%', #searchKeyword#, '%')
</isEqual>
<isEqual property="searchCondition" compareValue="2">
AND MKPI.YELLOW_ID LIKE CONCAT ('%', #searchKeyword#,'%')
</isEqual>
<isEqual property="searchCondition" compareValue="3">
AND MMGD.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%')
</isEqual>
</isNotEmpty>
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#
</select>
<select id="mjonKakaoATDAO.selectMjonKakaoATGroupCompleteByUserList_advc_back" parameterClass="kakaoVO" resultClass="kakaoVO">
SELECT
M2.totCnt ,
M2.userId ,