diff --git a/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java b/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java index bd2ac55c..d3513f0d 100644 --- a/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java +++ b/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java @@ -162,7 +162,14 @@ public class MjonMsgVO extends ComDefaultVO{ private String searchMsgResultCode; // 발송결과 검색필터 private String reqFullDate; + private String blineCode; + public String getBlineCode() { + return blineCode; + } + public void setBlineCode(String blineCode) { + this.blineCode = blineCode; + } public String getReqFullDate() { return reqFullDate; } 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 63e67f64..197a840a 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 @@ -48,6 +48,10 @@ THEN 'S' WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000') THEN 'S' + WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') + THEN 'S' + WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') + THEN 'S' WHEN ( A.RSLT_CODE IS NULL AND A.RSLT_CODE2 IS NULL @@ -74,6 +78,10 @@ THEN 'S' WHEN MD.AGENT_CODE = '07' AND (MD.RSLT_CODE = '6' OR MD.RSLT_CODE = '1000') THEN 'S' + WHEN MD.AGENT_CODE = '08' AND (MD.RSLT_CODE = '1000' OR MD.RSLT_CODE = '1001') + THEN 'S' + WHEN MD.AGENT_CODE = '09' AND (MD.RSLT_CODE = '1000' OR MD.RSLT_CODE = '1001') + THEN 'S' WHEN ( MD.RSLT_CODE IS NULL AND MD.RSLT_CODE2 IS NULL @@ -100,6 +108,10 @@ THEN 'S' WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000') THEN 'S' + WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') + THEN 'S' + WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') + THEN 'S' WHEN ( A.RSLT_CODE IS NULL AND A.RSLT_CODE2 IS NULL @@ -301,6 +313,10 @@ THEN 'S' WHEN B.AGENT_CODE = '07' AND (B.RSLT_CODE = '6' OR B.RSLT_CODE = '1000') THEN 'S' + WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001') + THEN 'S' + WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001') + THEN 'S' ELSE 'F' END) = 'S' ) AS successCount @@ -324,7 +340,11 @@ WHEN B.AGENT_CODE = '05' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') THEN 'E' WHEN B.AGENT_CODE = '07' AND B.RSLT_CODE = '9013' - THEN 'E' + THEN 'E' + WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') + THEN 'E' + WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') + THEN 'E' ELSE 'ETC' END) = 'E' ) AS callRejectionCount @@ -601,6 +621,7 @@ , M.smishingYn , M.vipYn , M.userCallbackYn + , M.blineCode , M.delayYn , M.delayCompleteYn , (SELECT @@ -624,6 +645,10 @@ THEN 'S' WHEN B.AGENT_CODE = '07' AND (B.RSLT_CODE = '6' OR B.RSLT_CODE = '1000') THEN 'S' + WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001') + THEN 'S' + WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001') + THEN 'S' ELSE 'F' END) = 'S' ) AS successCount @@ -647,7 +672,11 @@ WHEN B.AGENT_CODE = '05' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') THEN 'E' WHEN B.AGENT_CODE = '07' AND B.RSLT_CODE = '9013' - THEN 'E' + THEN 'E' + WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') + THEN 'E' + WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') + THEN 'E' ELSE 'ETC' END) = 'E' ) AS callRejectionCount @@ -710,6 +739,7 @@ , LMB.SMISHING_YN AS smishingYn , LMB.VIP_YN AS vipYn , LMB.CALLBACK_YN AS userCallbackYn + , IFNULL(LMB.BLINE_CODE, 'N') AS blineCode , A.DELAY_YN AS delayYn , A.DELAY_COMPLETE_YN AS delayCompleteYn FROM @@ -1026,6 +1056,10 @@ THEN 'S' WHEN AA.AGENT_CODE = '07' AND (AA.RSLT_CODE = '6' OR AA.RSLT_CODE = '1000') THEN 'S' + WHEN AA.AGENT_CODE = '08' AND (AA.RSLT_CODE = '1000' OR AA.RSLT_CODE = '1001') + THEN 'S' + WHEN AA.AGENT_CODE = '09' AND (AA.RSLT_CODE = '1000' OR AA.RSLT_CODE = '1001') + THEN 'S' WHEN ( AA.RSLT_CODE IS NULL AND AA.RSLT_CODE2 IS NULL @@ -1259,6 +1293,10 @@ THEN 'S' WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000') THEN 'S' + WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') + THEN 'S' + WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') + THEN 'S' WHEN ( A.RSLT_CODE IS NULL AND A.RSLT_CODE2 IS NULL @@ -2033,6 +2071,7 @@ , MANAGER_NM AS managerNm , EXCEPT_SPAM_YN AS exceptSpamYn , HOTLINE_AGENT_CODE AS hotlineAgentCode + , BLINE_CODE AS blineCode FROM LETTNGNRLMBER WHERE MBER_ID = #userId# @@ -3585,6 +3624,10 @@ THEN 'S' WHEN MMD.AGENT_CODE = '07' AND (MMD.RSLT_CODE = '6' OR MMD.RSLT_CODE = '1000') THEN 'S' + WHEN MMD.AGENT_CODE = '08' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') + THEN 'S' + WHEN MMD.AGENT_CODE = '09' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') + THEN 'S' WHEN ( MMD.RSLT_CODE IS NULL AND MMD.RSLT_CODE2 IS NULL @@ -3634,6 +3677,10 @@ THEN 'S' WHEN MMD.AGENT_CODE = '07' AND (MMD.RSLT_CODE = '6' OR MMD.RSLT_CODE = '1000') THEN 'S' + WHEN MMD.AGENT_CODE = '08' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') + THEN 'S' + WHEN MMD.AGENT_CODE = '09' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') + THEN 'S' WHEN ( MMD.RSLT_CODE IS NULL AND MMD.RSLT_CODE2 IS NULL @@ -5893,7 +5940,9 @@ WHEN A.AGENT_CODE = '01' AND A.RSLT_CODE = '100' AND A.RSLT_CODE2 = '0' THEN 'S' WHEN A.AGENT_CODE = '04' AND A.RSLT_CODE IN ('4100','6600') THEN 'S' WHEN A.AGENT_CODE = '05' AND A.RSLT_CODE IN ('1000','1001') THEN 'S' - WHEN A.AGENT_CODE = '07' AND A.RSLT_CODE IN ('6','1000') THEN 'S' + WHEN A.AGENT_CODE = '07' AND A.RSLT_CODE IN ('6','1000') THEN 'S' + WHEN A.AGENT_CODE = '08' AND A.RSLT_CODE IN ('1000','1001') THEN 'S' + WHEN A.AGENT_CODE = '09' AND A.RSLT_CODE IN ('1000','1001') THEN 'S' WHEN A.RSLT_CODE IS NULL AND A.RSLT_CODE2 IS NULL AND A.SENT_DATE IS NULL AND A.RSLT_DATE IS NULL THEN 'W' ELSE 'F' END AS SWF @@ -5906,7 +5955,7 @@ B.MSG_TYPE IN (4, 6) AND A.SENT_DATE >= DATE_FORMAT(#statStartDate#, '%Y-%m-%d') AND DATE_FORMAT(#statStandardDate#, '%Y-%m-%d') > A.SENT_DATE - AND A.AGENT_CODE IN ('01','04','05','07') + AND A.AGENT_CODE IN ('01','04','05','07','08','09') ) B LEFT OUTER JOIN mj_msg_cost AGENT ON B.AGENT_CODE = AGENT.AGENT_CODE @@ -5990,6 +6039,10 @@ SELECT DATE_FORMAT(#statStartDate#, '%Y-%m-%d'),'05','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0',NOW() UNION ALL SELECT DATE_FORMAT(#statStartDate#, '%Y-%m-%d'),'07','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0',NOW() + UNION ALL + SELECT DATE_FORMAT(#statStartDate#, '%Y-%m-%d'),'08','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0',NOW() + UNION ALL + SELECT DATE_FORMAT(#statStartDate#, '%Y-%m-%d'),'09','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0',NOW() ) C GROUP BY C.RSLT_DATE diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp index f530089c..37701685 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp @@ -499,7 +499,7 @@ function fnSmishingUpdate(flag) { class="smishing"> -
vip"> +
vip bMark"> '); return false;"> () @@ -644,7 +644,7 @@ function fnSmishingUpdate(flag) { - +