wyh 2023-06-14
수정
@e4771a8f514a3ccc5907e41d0e2b1319ea58c83a
src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java
--- src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java
+++ src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java
@@ -162,7 +162,14 @@
 	
 	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;
 	}
src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
--- 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 @@
 		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
@@ -99,6 +107,10 @@
 		WHEN A.AGENT_CODE = '05' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
 		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
@@ -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
@@ -623,6 +644,10 @@
 							WHEN B.AGENT_CODE = '05' AND (B.RSLT_CODE = '1000' OR B.RSLT_CODE = '1001')
 							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'
@@ -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
@@ -1258,6 +1292,10 @@
 						WHEN A.AGENT_CODE  = '05' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
 						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
@@ -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
@@ -3633,6 +3676,10 @@
 				WHEN MMD.AGENT_CODE = '05' AND (MMD.RSLT_CODE = '1000' OR MMD.RSLT_CODE = '1001')
 				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
@@ -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
src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp
--- 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 @@
 			                	</c:if>
 							</td>
 							<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
-								<div class="id_box  <c:if test='${result.vipYn eq "Y" }'>vip</c:if>">
+								<div class="id_box <c:if test='${result.vipYn eq "Y" }'>vip</c:if> <c:if test='${result.blineCode ne "N" }'>bMark</c:if>">
 									<a href="#" onclick="javascript:fnSelectMber('<c:out value="${result.userId}"/>'); return false;">
 										<c:out value="${result.userId}"/>(<c:out value="${result.userNm}"/>)
 									</a>
@@ -644,7 +644,7 @@
 						</tr>
 						</c:forEach>
 						<c:if test="${empty resultList}">
-		         			<tr><td colspan="8"><spring:message code="common.nodata.msg" /></td></tr>
+		         			<tr><td colspan="11"><spring:message code="common.nodata.msg" /></td></tr>
 		         		</c:if>    
 					</tbody>
 				</table>
Add a comment
List