From b7c3dfd3ee4cbb407846ba8a05ed4e1017f908f6 Mon Sep 17 00:00:00 2001
From: name <mail>
Date: Wed, 9 Aug 2023 10:10:15 +0900
Subject: [PATCH] =?UTF-8?q?API=20=EB=B0=9C=EC=86=A1=ED=86=B5=EA=B3=84=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml       | 11 +++++------
 .../WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp | 14 +++++++++++++-
 .../jsp/web/msgsent/MsgSentCompleteListAjax.jsp    | 14 +++++++++++++-
 .../jsp/web/msgsent/MsgSentFailListAjax.jsp        | 14 +++++++++++++-
 .../jsp/web/msgsent/MsgSentReadyListAjax.jsp       | 14 +++++++++++++-
 5 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
index cda1d231..1e7b7c9e 100644
--- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
@@ -288,10 +288,7 @@
 				, A.CUR_STATE
 				, A.RSLT_CODE
 				, A.RSLT_CODE2
-				, CASE
-					WHEN B.SEND_KIND = 'H' THEN 'WEB'
-					ELSE 'API'
-				END as sendKind
+				, B.SEND_KIND as sendKind
 				, CASE
 					WHEN B.MSG_TYPE = '6'
 						AND B.FILE_CNT > 0
@@ -496,7 +493,7 @@
 				, MD.CUR_STATE
 				, MD.RSLT_CODE
 				, MD.RSLT_CODE2
-				, CASE WHEN MGD.SEND_KIND = 'H' THEN 'WEB' ELSE 'API' END as sendKind
+				, MGD.SEND_KIND AS sendKind
 				,(<include refid="MjonMsgSentDAO.selectAgentResultQuery_MD"/>) AS RESULT
 			FROM
 				mj_msg_data MD
@@ -589,6 +586,9 @@
 				AND	CALL_FROM LIKE CONCAT('%', #searchKeyword#, '%')
 			</isEqual>
 		</isNotEmpty>
+		<isNotEmpty property="searchCondition_01">
+			AND sendKind = #searchCondition_01#
+		</isNotEmpty>
 		<isNotEmpty property="startDate">
 			<![CDATA[ 
 				AND 	DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
@@ -613,7 +613,6 @@
 			$searchSortOrd$
 		</isNotEmpty>
 		LIMIT  #recordCountPerPage# OFFSET #firstIndex#	
-	
 	</select>
 	
 	
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
index 5b9bd03a..deece58f 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
@@ -178,7 +178,19 @@ $(document).ready(function(){
 								</p>
 							</td>
 							<td name="listTd">
-								<p>${resultAllSentList.sendKind }</p>
+								<p>
+									<c:choose>
+										<c:when test="${resultAllSentList.sendKind eq 'H' }">
+											WEB
+										</c:when>
+										<c:when test="${resultAllSentList.sendKind eq 'A'}">
+											API
+										</c:when>
+										<c:otherwise>
+											-
+										</c:otherwise>
+									</c:choose>
+								</p>
 							</td>
 							<td name="listTd">
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp
index 7b0585a3..a5de4765 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp
@@ -170,7 +170,19 @@ $(document).ready(function(){
 								</p>
 							</td>
 							<td>
-								${resultAllSentList.sendKind }
+								<p>
+									<c:choose>
+										<c:when test="${resultAllSentList.sendKind eq 'H' }">
+											WEB
+										</c:when>
+										<c:when test="${resultAllSentList.sendKind eq 'A'}">
+											API
+										</c:when>
+										<c:otherwise>
+											-
+										</c:otherwise>
+									</c:choose>
+								</p>
 							</td>
 							<td>
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp
index f04c9625..9f2c1031 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp
@@ -158,7 +158,19 @@ $(document).ready(function(){
 								</p>
 							</td>
 							<td>
-								${resultAllSentList.sendKind }
+								<p>
+									<c:choose>
+										<c:when test="${resultAllSentList.sendKind eq 'H' }">
+											WEB
+										</c:when>
+										<c:when test="${resultAllSentList.sendKind eq 'A'}">
+											API
+										</c:when>
+										<c:otherwise>
+											-
+										</c:otherwise>
+									</c:choose>
+								</p>
 							</td>
 							<td>
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp
index 54ba3242..f4958edb 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp
@@ -170,7 +170,19 @@ $(document).ready(function(){
 								</p>
 							</td>
 							<td>
-								${resultAllSentList.sendKind }
+								<p>
+									<c:choose>
+										<c:when test="${resultAllSentList.sendKind eq 'H' }">
+											WEB
+										</c:when>
+										<c:when test="${resultAllSentList.sendKind eq 'A'}">
+											API
+										</c:when>
+										<c:otherwise>
+											-
+										</c:otherwise>
+									</c:choose>
+								</p>
 							</td>
 							<td>
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>