Merge branch 'jsp'

This commit is contained in:
itn 2023-06-19 16:48:00 +09:00
commit d9b245ceeb
2 changed files with 246 additions and 215 deletions

View File

@ -202,45 +202,70 @@
<!-- 전체 발송결과 조회 (그룹별)--> <!-- 전체 발송결과 조회 (그룹별)-->
<select id="KakaoSentDAO.selectAllKakaoSentList" parameterClass="kakaoSentVO" resultClass="kakaoSentVO"> <select id="KakaoSentDAO.selectAllKakaoSentList" parameterClass="kakaoSentVO" resultClass="kakaoSentVO">
SELECT SELECT
COUNT(M.USER_ID) OVER() AS totMsgCnt , M2.totMsgCnt ,
M.USER_ID AS userId , M2.userId ,
MSG_GROUP_ID AS msgGroupId , M2.msgGroupId ,
MSG_GROUP_CNT AS msgGroupCnt , M2.msgGroupCnt ,
SMS_TXT AS smsTxt , M2.smsTxt ,
M.SUBJECT AS subject , M2.subject ,
DATE_FORMAT(REGDATE, '%Y-%m-%d %T') AS regDate , M2.regDate ,
DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqDate , M2.reqDate ,
DATE_FORMAT(RSLT_DATE, '%Y-%m-%d %T') AS rsltDate , M2.rsltDate ,
CALL_FROM AS callFrom , M2.callFrom ,
CALL_TO AS callTo , M2.callTo ,
IFNULL(ADDR_NM, '-') AS addrNm , M2.addrNm ,
TOT_PRICE AS totPrice , M2.totPrice ,
EACH_PRICE AS eachPrice , M2.eachPrice ,
CUR_STATE AS curState , M2.curState ,
RSLT_CODE AS rsltCode , M2.rsltCode ,
RSLT_CODE2 AS rsltCode2 , M2.rsltCode2 ,
IF((RSLT_CODE != '7000'),'1','0') AS orderByrsltCode , M2.orderByrsltCode ,
DEL_FLAG AS delFlag , M2.delFlag ,
M.MSG_TYPE AS msgType , M2.msgType ,
FILE_CNT AS fileCnt , M2.fileCnt ,
AGENT_CODE AS agentCode , M2.agentCode ,
RESERVE_YN AS reserveYn , M2.reserveYn ,
RESERVE_C_YN AS reserveCYn , M2.reserveCYn ,
CANCELDATE AS cancelDate , M2.cancelDate ,
msgTypeName AS msgTypeName , M2.msgTypeName ,
orderByCode AS orderByCode , M2.orderByCode ,
RESULT AS msgResult , M2.msgResult ,
successCount, ( SELECT COUNT(0)
waitCount, FROM MJ_MSG_DATA C
failCount, WHERE C.DEL_FLAG = 'N'
BIZ_UMID AS bizUmid, AND C.RESERVE_C_YN = 'N'
BL.CALL_STATUS AS callStatus, AND C.MSG_GROUP_ID = M2.msgGroupId
M.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn, 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) ( SELECT COUNT(0)
FROM BIZ_LOG BL1, FROM BIZ_LOG BL1,
MJ_MSG_DATA MMD1 MJ_MSG_DATA MMD1
WHERE M.BIZ_KAKAO_RESEND_YN = 'Y' WHERE M2.bizKakaoResendYn = 'Y'
AND M.MSG_GROUP_ID = MMD1.MSG_GROUP_ID AND M2.msgGroupId = MMD1.MSG_GROUP_ID
AND MMD1.BIZ_UMID = BL1.CMID AND MMD1.BIZ_UMID = BL1.CMID
AND ( AND (
CASE CASE
@ -252,8 +277,8 @@
( SELECT COUNT(0) ( SELECT COUNT(0)
FROM BIZ_LOG BL1, FROM BIZ_LOG BL1,
MJ_MSG_DATA MMD1 MJ_MSG_DATA MMD1
WHERE M.BIZ_KAKAO_RESEND_YN = 'Y' WHERE M2.bizKakaoResendYn = 'Y'
AND M.MSG_GROUP_ID = MMD1.MSG_GROUP_ID AND M2.msgGroupId = MMD1.MSG_GROUP_ID
AND MMD1.BIZ_UMID = BL1.CMID AND MMD1.BIZ_UMID = BL1.CMID
AND ( AND (
CASE CASE
@ -262,185 +287,191 @@
ELSE 'F' ELSE 'F'
END ) = 'F' END ) = 'F'
) kakaoResendFailCount ) kakaoResendFailCount
FROM ( FROM (
SELECT MG.USER_ID , SELECT
MG.MSG_GROUP_ID , COUNT(M.USER_ID) OVER() AS totMsgCnt ,
MG.MSG_GROUP_CNT , M.USER_ID AS userId ,
MG.SMS_TXT , MSG_GROUP_ID AS msgGroupId ,
MG.SUBJECT , MSG_GROUP_CNT AS msgGroupCnt ,
MG.REGDATE , SMS_TXT AS smsTxt ,
MG.REQ_DATE , M.SUBJECT AS subject ,
MD.RSLT_DATE , DATE_FORMAT(REGDATE, '%Y-%m-%d %T') AS regDate ,
MG.CALL_FROM , DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T') AS reqDate ,
MG.TOT_PRICE , DATE_FORMAT(RSLT_DATE, '%Y-%m-%d %T') AS rsltDate ,
MG.EACH_PRICE , CALL_FROM AS callFrom ,
MG.DEL_FLAG , CALL_TO AS callTo ,
MG.MSG_TYPE , IFNULL(ADDR_NM, '-') AS addrNm ,
MG.FILE_CNT , TOT_PRICE AS totPrice ,
MG.AGENT_CODE , EACH_PRICE AS eachPrice ,
MG.RESERVE_YN , CUR_STATE AS curState ,
MG.RESERVE_C_YN , RSLT_CODE AS rsltCode ,
MG.CANCELDATE , RSLT_CODE2 AS rsltCode2 ,
MD.MSG_SEQ , IF((RSLT_CODE != '7000'),'1','0') AS orderByrsltCode ,
MD.CALL_TO , DEL_FLAG AS delFlag ,
MD.CUR_STATE , M.MSG_TYPE AS msgType ,
MD.RSLT_CODE , FILE_CNT AS fileCnt ,
MD.RSLT_CODE2 , AGENT_CODE AS agentCode ,
CASE RESERVE_YN AS reserveYn ,
WHEN MG.MSG_TYPE = '8' RESERVE_C_YN AS reserveCYn ,
THEN '알림톡' CANCELDATE AS cancelDate ,
WHEN MG.MSG_TYPE = '9' msgTypeName AS msgTypeName ,
THEN '친구톡' orderByCode AS orderByCode ,
END msgTypeName , RESULT AS msgResult ,
CASE BIZ_UMID AS bizUmid,
WHEN MG.MSG_TYPE = '8' BL.CALL_STATUS AS callStatus,
THEN '1' M.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn
ELSE '2' FROM (
END orderByCode , ( SELECT MG.USER_ID ,
CASE MG.MSG_GROUP_ID ,
WHEN MD.RSLT_CODE = '7000' MG.MSG_GROUP_CNT ,
THEN 'S' MG.SMS_TXT ,
WHEN (MD.RSLT_CODE IS NULL AND MD.SENT_DATE IS NULL AND MD.RSLT_DATE IS NULL) MG.SUBJECT ,
THEN 'W' MG.REGDATE ,
ELSE 'F' MG.REQ_DATE ,
END ) AS result , MD.RSLT_DATE ,
( SELECT COUNT(0) MG.CALL_FROM ,
FROM MJ_MSG_DATA C MG.TOT_PRICE ,
WHERE C.DEL_FLAG = 'N' MG.EACH_PRICE ,
AND C.RESERVE_C_YN = 'N' MG.DEL_FLAG ,
AND C.MSG_GROUP_ID = MG.MSG_GROUP_ID MG.MSG_TYPE ,
AND C.RSLT_CODE = '7000' MG.FILE_CNT ,
) AS successCount , MG.AGENT_CODE ,
( SELECT COUNT(0) MG.RESERVE_YN ,
FROM MJ_MSG_DATA C MG.RESERVE_C_YN ,
WHERE C.DEL_FLAG = 'N' MG.CANCELDATE ,
AND C.RESERVE_C_YN = 'N' MD.MSG_SEQ ,
AND C.MSG_GROUP_ID = MG.MSG_GROUP_ID MD.CALL_TO ,
AND ( MD.CUR_STATE ,
C.RSLT_CODE IS NULL MD.RSLT_CODE ,
AND C.SENT_DATE IS NULL MD.RSLT_CODE2 ,
AND C.RSLT_DATE IS NULL CASE
) WHEN MG.MSG_TYPE = '8'
) AS waitCount , THEN '알림톡'
( SELECT COUNT(0) WHEN MG.MSG_TYPE = '9'
FROM MJ_MSG_DATA C THEN '친구톡'
WHERE C.DEL_FLAG = 'N' END msgTypeName ,
AND C.RESERVE_C_YN = 'N' CASE
AND C.MSG_GROUP_ID = MG.MSG_GROUP_ID WHEN MG.MSG_TYPE = '8'
AND ( THEN '1'
C.RSLT_CODE != '7000' ELSE '2'
AND C.RSLT_CODE IS NOT NULL END orderByCode , (
) CASE
) AS failCount , WHEN MD.RSLT_CODE = '7000'
MSG_NOTICETALK_SENDER_KEY , THEN 'S'
MSG_NOTICETALK_TMP_KEY, WHEN (MD.RSLT_CODE IS NULL AND MD.SENT_DATE IS NULL AND MD.RSLT_DATE IS NULL)
MD.BIZ_UMID, THEN 'W'
MD.BIZ_KAKAO_RESEND_YN ELSE 'F'
FROM MJ_MSG_DATA MD , END ) AS result ,
MJ_MSG_GROUP_DATA MG MSG_NOTICETALK_SENDER_KEY ,
WHERE MD.MSG_GROUP_ID = MG.MSG_GROUP_ID MSG_NOTICETALK_TMP_KEY,
AND IFNULL(MG.DEL_FLAG, 'N') = 'N' MD.BIZ_UMID,
AND MD.DEL_FLAG = 'N' MD.BIZ_KAKAO_RESEND_YN
AND MG.USER_ID = #userId# FROM MJ_MSG_DATA MD ,
AND MG.DEL_FLAG ='N' MJ_MSG_GROUP_DATA MG
/* JSPark 2023.03.23 => 예약건중 발송완료건도 발송결과에 노출되도록 수정 */ WHERE MD.MSG_GROUP_ID = MG.MSG_GROUP_ID
/* AND MG.RESERVE_YN = 'N' */ AND IFNULL(MG.DEL_FLAG, 'N') = 'N'
<![CDATA[ AND MG.REQ_DATE <= NOW() ]]> 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"> <isNotEmpty property="stateType">
AND MG.RESERVE_C_YN = #reserveCYn# <isEqual property="stateType" compareValue="all">
</isNotEmpty> AND MD.CUR_STATE IN ('0','1','2','3')
</isEqual>
<isNotEmpty property="stateType"> <isEqual property="stateType" compareValue="ready">
<isEqual property="stateType" compareValue="all"> AND MD.CUR_STATE = '0'
AND MD.CUR_STATE IN ('0','1','2','3') AND MD.RESERVE_C_YN = 'N'
</isEqual> </isEqual>
<isEqual property="stateType" compareValue="ready"> <isEqual property="stateType" compareValue="complete">
AND MD.CUR_STATE = '0' AND MD.CUR_STATE IN ('2','3')
AND MD.RESERVE_C_YN = 'N' AND MD.RSLT_CODE = '7000'
</isEqual> AND MD.RESERVE_C_YN = 'N'
<isEqual property="stateType" compareValue="complete"> </isEqual>
AND MD.CUR_STATE IN ('2','3') <isEqual property="stateType" compareValue="fail">
AND MD.RSLT_CODE = '7000' AND MD.RESERVE_C_YN = 'N'
AND MD.RESERVE_C_YN = 'N' AND MD.RSLT_CODE != '7000'
</isEqual> </isEqual>
<isEqual property="stateType" compareValue="fail"> </isNotEmpty>
AND MD.RESERVE_C_YN = 'N' <isNotEmpty property="tabType">
AND MD.RSLT_CODE != '7000' <isEqual property="tabType" compareValue="at">
</isEqual> AND MD.MSG_TYPE = '8'
</isNotEmpty> </isEqual>
<isNotEmpty property="tabType"> <isEqual property="tabType" compareValue="ft">
<isEqual property="tabType" compareValue="at"> AND MD.MSG_TYPE = '9'
AND MD.MSG_TYPE = '8' </isEqual>
</isEqual> <isEqual property="tabType" compareValue="all">
<isEqual property="tabType" compareValue="ft"> AND MD.MSG_TYPE IN ('8','9')
AND MD.MSG_TYPE = '9' </isEqual>
</isEqual> </isNotEmpty>
<isEqual property="tabType" compareValue="all"> <isEmpty property="tabType">
AND MD.MSG_TYPE IN ('8','9') AND MD.MSG_TYPE IN ('8','9')
</isEqual> </isEmpty>
</isNotEmpty>
<isEmpty property="tabType">
AND MD.MSG_TYPE IN ('8','9') <!-- <isEmpty property="reserveYn">
</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">
<![CDATA[ <![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>
<isNotEmpty property="endDate"> <isNotEmpty property="searchSortOrd">
<![CDATA[ $searchSortOrd$
AND DATE_FORMAT(REGDATE, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d')
]]>
</isNotEmpty> </isNotEmpty>
GROUP BY MSG_GROUP_ID LIMIT #recordCountPerPage# OFFSET #firstIndex#
ORDER BY 1=1 ) M2
<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>

View File

@ -77,11 +77,11 @@ $(document).ready(function(){
<table class="tType4"> <table class="tType4">
<colgroup> <colgroup>
<col style="width: 40px;"> <col style="width: 40px;">
<col style="width: 16%;"> <col style="width: 14%;">
<col style="width: 12%;"> <col style="width: 7%;">
<col style="width: 10%;"> <col style="width: 10%;">
<col style="width: 18%;">
<col style="width: 12%;"> <col style="width: 12%;">
<col style="width: 13%;">
<col style="width: 10%;"> <col style="width: 10%;">
<col style="width: 12%;"> <col style="width: 12%;">
<col style="width: 7%;"> <col style="width: 7%;">