수정
@e4771a8f514a3ccc5907e41d0e2b1319ea58c83a
--- src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java
+++ src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java
... | ... | @@ -162,7 +162,14 @@ |
| 162 | 162 |
|
| 163 | 163 |
private String searchMsgResultCode; // 발송결과 검색필터 |
| 164 | 164 |
private String reqFullDate; |
| 165 |
+ private String blineCode; |
|
| 165 | 166 |
|
| 167 |
+ public String getBlineCode() {
|
|
| 168 |
+ return blineCode; |
|
| 169 |
+ } |
|
| 170 |
+ public void setBlineCode(String blineCode) {
|
|
| 171 |
+ this.blineCode = blineCode; |
|
| 172 |
+ } |
|
| 166 | 173 |
public String getReqFullDate() {
|
| 167 | 174 |
return reqFullDate; |
| 168 | 175 |
} |
--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
... | ... | @@ -48,6 +48,10 @@ |
| 48 | 48 |
THEN 'S' |
| 49 | 49 |
WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000') |
| 50 | 50 |
THEN 'S' |
| 51 |
+ WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') |
|
| 52 |
+ THEN 'S' |
|
| 53 |
+ WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') |
|
| 54 |
+ THEN 'S' |
|
| 51 | 55 |
WHEN ( |
| 52 | 56 |
A.RSLT_CODE IS NULL |
| 53 | 57 |
AND A.RSLT_CODE2 IS NULL |
... | ... | @@ -74,6 +78,10 @@ |
| 74 | 78 |
THEN 'S' |
| 75 | 79 |
WHEN MD.AGENT_CODE = '07' AND (MD.RSLT_CODE = '6' OR MD.RSLT_CODE = '1000') |
| 76 | 80 |
THEN 'S' |
| 81 |
+ WHEN MD.AGENT_CODE = '08' AND (MD.RSLT_CODE = '1000' OR MD.RSLT_CODE = '1001') |
|
| 82 |
+ THEN 'S' |
|
| 83 |
+ WHEN MD.AGENT_CODE = '09' AND (MD.RSLT_CODE = '1000' OR MD.RSLT_CODE = '1001') |
|
| 84 |
+ THEN 'S' |
|
| 77 | 85 |
WHEN ( |
| 78 | 86 |
MD.RSLT_CODE IS NULL |
| 79 | 87 |
AND MD.RSLT_CODE2 IS NULL |
... | ... | @@ -99,6 +107,10 @@ |
| 99 | 107 |
WHEN A.AGENT_CODE = '05' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') |
| 100 | 108 |
THEN 'S' |
| 101 | 109 |
WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000') |
| 110 |
+ THEN 'S' |
|
| 111 |
+ WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') |
|
| 112 |
+ THEN 'S' |
|
| 113 |
+ WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') |
|
| 102 | 114 |
THEN 'S' |
| 103 | 115 |
WHEN ( |
| 104 | 116 |
A.RSLT_CODE IS NULL |
... | ... | @@ -301,6 +313,10 @@ |
| 301 | 313 |
THEN 'S' |
| 302 | 314 |
WHEN B.AGENT_CODE = '07' AND (B.RSLT_CODE = '6' OR B.RSLT_CODE = '1000') |
| 303 | 315 |
THEN 'S' |
| 316 |
+ WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001') |
|
| 317 |
+ THEN 'S' |
|
| 318 |
+ WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001') |
|
| 319 |
+ THEN 'S' |
|
| 304 | 320 |
ELSE 'F' |
| 305 | 321 |
END) = 'S' |
| 306 | 322 |
) AS successCount |
... | ... | @@ -324,7 +340,11 @@ |
| 324 | 340 |
WHEN B.AGENT_CODE = '05' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') |
| 325 | 341 |
THEN 'E' |
| 326 | 342 |
WHEN B.AGENT_CODE = '07' AND B.RSLT_CODE = '9013' |
| 327 |
- THEN 'E' |
|
| 343 |
+ THEN 'E' |
|
| 344 |
+ WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') |
|
| 345 |
+ THEN 'E' |
|
| 346 |
+ WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') |
|
| 347 |
+ THEN 'E' |
|
| 328 | 348 |
ELSE 'ETC' |
| 329 | 349 |
END) = 'E' |
| 330 | 350 |
) AS callRejectionCount |
... | ... | @@ -601,6 +621,7 @@ |
| 601 | 621 |
, M.smishingYn |
| 602 | 622 |
, M.vipYn |
| 603 | 623 |
, M.userCallbackYn |
| 624 |
+ , M.blineCode |
|
| 604 | 625 |
, M.delayYn |
| 605 | 626 |
, M.delayCompleteYn |
| 606 | 627 |
, (SELECT |
... | ... | @@ -623,6 +644,10 @@ |
| 623 | 644 |
WHEN B.AGENT_CODE = '05' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001') |
| 624 | 645 |
THEN 'S' |
| 625 | 646 |
WHEN B.AGENT_CODE = '07' AND (B.RSLT_CODE = '6' OR B.RSLT_CODE = '1000') |
| 647 |
+ THEN 'S' |
|
| 648 |
+ WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001') |
|
| 649 |
+ THEN 'S' |
|
| 650 |
+ WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001') |
|
| 626 | 651 |
THEN 'S' |
| 627 | 652 |
ELSE 'F' |
| 628 | 653 |
END) = 'S' |
... | ... | @@ -647,7 +672,11 @@ |
| 647 | 672 |
WHEN B.AGENT_CODE = '05' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') |
| 648 | 673 |
THEN 'E' |
| 649 | 674 |
WHEN B.AGENT_CODE = '07' AND B.RSLT_CODE = '9013' |
| 650 |
- THEN 'E' |
|
| 675 |
+ THEN 'E' |
|
| 676 |
+ WHEN B.AGENT_CODE = '08' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') |
|
| 677 |
+ THEN 'E' |
|
| 678 |
+ WHEN B.AGENT_CODE = '09' AND (B.RSLT_CODE = '2404' OR B.RSLT_CODE = '3404' OR B.RSLT_CODE = '6404') |
|
| 679 |
+ THEN 'E' |
|
| 651 | 680 |
ELSE 'ETC' |
| 652 | 681 |
END) = 'E' |
| 653 | 682 |
) AS callRejectionCount |
... | ... | @@ -710,6 +739,7 @@ |
| 710 | 739 |
, LMB.SMISHING_YN AS smishingYn |
| 711 | 740 |
, LMB.VIP_YN AS vipYn |
| 712 | 741 |
, LMB.CALLBACK_YN AS userCallbackYn |
| 742 |
+ , IFNULL(LMB.BLINE_CODE, 'N') AS blineCode |
|
| 713 | 743 |
, A.DELAY_YN AS delayYn |
| 714 | 744 |
, A.DELAY_COMPLETE_YN AS delayCompleteYn |
| 715 | 745 |
FROM |
... | ... | @@ -1026,6 +1056,10 @@ |
| 1026 | 1056 |
THEN 'S' |
| 1027 | 1057 |
WHEN AA.AGENT_CODE = '07' AND (AA.RSLT_CODE = '6' OR AA.RSLT_CODE = '1000') |
| 1028 | 1058 |
THEN 'S' |
| 1059 |
+ WHEN AA.AGENT_CODE = '08' AND (AA.RSLT_CODE = '1000' OR AA.RSLT_CODE = '1001') |
|
| 1060 |
+ THEN 'S' |
|
| 1061 |
+ WHEN AA.AGENT_CODE = '09' AND (AA.RSLT_CODE = '1000' OR AA.RSLT_CODE = '1001') |
|
| 1062 |
+ THEN 'S' |
|
| 1029 | 1063 |
WHEN ( |
| 1030 | 1064 |
AA.RSLT_CODE IS NULL |
| 1031 | 1065 |
AND AA.RSLT_CODE2 IS NULL |
... | ... | @@ -1258,6 +1292,10 @@ |
| 1258 | 1292 |
WHEN A.AGENT_CODE = '05' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') |
| 1259 | 1293 |
THEN 'S' |
| 1260 | 1294 |
WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000') |
| 1295 |
+ THEN 'S' |
|
| 1296 |
+ WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') |
|
| 1297 |
+ THEN 'S' |
|
| 1298 |
+ WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001') |
|
| 1261 | 1299 |
THEN 'S' |
| 1262 | 1300 |
WHEN ( |
| 1263 | 1301 |
A.RSLT_CODE IS NULL |
... | ... | @@ -2033,6 +2071,7 @@ |
| 2033 | 2071 |
, MANAGER_NM AS managerNm |
| 2034 | 2072 |
, EXCEPT_SPAM_YN AS exceptSpamYn |
| 2035 | 2073 |
, HOTLINE_AGENT_CODE AS hotlineAgentCode |
| 2074 |
+ , BLINE_CODE AS blineCode |
|
| 2036 | 2075 |
FROM LETTNGNRLMBER |
| 2037 | 2076 |
WHERE MBER_ID = #userId# |
| 2038 | 2077 |
|
... | ... | @@ -3585,6 +3624,10 @@ |
| 3585 | 3624 |
THEN 'S' |
| 3586 | 3625 |
WHEN MMD.AGENT_CODE = '07' AND (MMD.RSLT_CODE = '6' OR MMD.RSLT_CODE = '1000') |
| 3587 | 3626 |
THEN 'S' |
| 3627 |
+ WHEN MMD.AGENT_CODE = '08' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') |
|
| 3628 |
+ THEN 'S' |
|
| 3629 |
+ WHEN MMD.AGENT_CODE = '09' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') |
|
| 3630 |
+ THEN 'S' |
|
| 3588 | 3631 |
WHEN ( |
| 3589 | 3632 |
MMD.RSLT_CODE IS NULL |
| 3590 | 3633 |
AND MMD.RSLT_CODE2 IS NULL |
... | ... | @@ -3633,6 +3676,10 @@ |
| 3633 | 3676 |
WHEN MMD.AGENT_CODE = '05' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') |
| 3634 | 3677 |
THEN 'S' |
| 3635 | 3678 |
WHEN MMD.AGENT_CODE = '07' AND (MMD.RSLT_CODE = '6' OR MMD.RSLT_CODE = '1000') |
| 3679 |
+ THEN 'S' |
|
| 3680 |
+ WHEN MMD.AGENT_CODE = '08' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') |
|
| 3681 |
+ THEN 'S' |
|
| 3682 |
+ WHEN MMD.AGENT_CODE = '09' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001') |
|
| 3636 | 3683 |
THEN 'S' |
| 3637 | 3684 |
WHEN ( |
| 3638 | 3685 |
MMD.RSLT_CODE IS NULL |
... | ... | @@ -5893,7 +5940,9 @@ |
| 5893 | 5940 |
WHEN A.AGENT_CODE = '01' AND A.RSLT_CODE = '100' AND A.RSLT_CODE2 = '0' THEN 'S' |
| 5894 | 5941 |
WHEN A.AGENT_CODE = '04' AND A.RSLT_CODE IN ('4100','6600') THEN 'S'
|
| 5895 | 5942 |
WHEN A.AGENT_CODE = '05' AND A.RSLT_CODE IN ('1000','1001') THEN 'S'
|
| 5896 |
- WHEN A.AGENT_CODE = '07' AND A.RSLT_CODE IN ('6','1000') THEN 'S'
|
|
| 5943 |
+ WHEN A.AGENT_CODE = '07' AND A.RSLT_CODE IN ('6','1000') THEN 'S'
|
|
| 5944 |
+ WHEN A.AGENT_CODE = '08' AND A.RSLT_CODE IN ('1000','1001') THEN 'S'
|
|
| 5945 |
+ WHEN A.AGENT_CODE = '09' AND A.RSLT_CODE IN ('1000','1001') THEN 'S'
|
|
| 5897 | 5946 |
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' |
| 5898 | 5947 |
ELSE 'F' |
| 5899 | 5948 |
END AS SWF |
... | ... | @@ -5906,7 +5955,7 @@ |
| 5906 | 5955 |
B.MSG_TYPE IN (4, 6) |
| 5907 | 5956 |
AND A.SENT_DATE >= DATE_FORMAT(#statStartDate#, '%Y-%m-%d') |
| 5908 | 5957 |
AND DATE_FORMAT(#statStandardDate#, '%Y-%m-%d') > A.SENT_DATE |
| 5909 |
- AND A.AGENT_CODE IN ('01','04','05','07')
|
|
| 5958 |
+ AND A.AGENT_CODE IN ('01','04','05','07','08','09')
|
|
| 5910 | 5959 |
) B |
| 5911 | 5960 |
LEFT OUTER JOIN mj_msg_cost AGENT |
| 5912 | 5961 |
ON B.AGENT_CODE = AGENT.AGENT_CODE |
... | ... | @@ -5990,6 +6039,10 @@ |
| 5990 | 6039 |
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() |
| 5991 | 6040 |
UNION ALL |
| 5992 | 6041 |
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() |
| 6042 |
+ UNION ALL |
|
| 6043 |
+ 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() |
|
| 6044 |
+ UNION ALL |
|
| 6045 |
+ 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() |
|
| 5993 | 6046 |
) C |
| 5994 | 6047 |
GROUP BY |
| 5995 | 6048 |
C.RSLT_DATE |
--- src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp
+++ src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp
... | ... | @@ -499,7 +499,7 @@ |
| 499 | 499 |
</c:if> |
| 500 | 500 |
</td> |
| 501 | 501 |
<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
|
| 502 |
- <div class="id_box <c:if test='${result.vipYn eq "Y" }'>vip</c:if>">
|
|
| 502 |
+ <div class="id_box <c:if test='${result.vipYn eq "Y" }'>vip</c:if> <c:if test='${result.blineCode ne "N" }'>bMark</c:if>">
|
|
| 503 | 503 |
<a href="#" onclick="javascript:fnSelectMber('<c:out value="${result.userId}"/>'); return false;">
|
| 504 | 504 |
<c:out value="${result.userId}"/>(<c:out value="${result.userNm}"/>)
|
| 505 | 505 |
</a> |
... | ... | @@ -644,7 +644,7 @@ |
| 644 | 644 |
</tr> |
| 645 | 645 |
</c:forEach> |
| 646 | 646 |
<c:if test="${empty resultList}">
|
| 647 |
- <tr><td colspan="8"><spring:message code="common.nodata.msg" /></td></tr> |
|
| 647 |
+ <tr><td colspan="11"><spring:message code="common.nodata.msg" /></td></tr> |
|
| 648 | 648 |
</c:if> |
| 649 | 649 |
</tbody> |
| 650 | 650 |
</table> |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?