From 5ec476e72149dfc774d5f94e2d4abfb4dd7b0824 Mon Sep 17 00:00:00 2001
From: "hehihoho3@gmail.com" <hehihoho3@gmail.com>
Date: Wed, 22 Oct 2025 14:54:43 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B9=B4=ED=86=A1=EC=A0=84=EC=86=A1=EB=A6=AC?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8(=EC=A0=84=EC=B2=B4)=20=EB=A9=94=EB=89=B4?=
 =?UTF-8?q?=EC=97=90=20=EB=B0=9C=EC=86=A1=EB=B0=A9=EC=8B=9D=20(WEB,API)=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/kakaoAt/web/MjonKakaoATController.java | 10 ++++++++++
 .../java/itn/let/kakao/kakaoComm/KakaoVO.java    |  2 ++
 .../let/kakao/MjonKakaoATData_SQL_mysql.xml      | 12 +++++++++++-
 .../jsp/uss/ion/kakaoat/SendKakaoATList.jsp      | 16 ++++++++++++++--
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java b/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java
index 4658183..63ac46a 100644
--- a/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java
+++ b/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java
@@ -139,6 +139,16 @@ public class MjonKakaoATController {
 			resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList_advc(kakaoVO);
 			int totCnt = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserListCnt_advc(kakaoVO);
 			
+			
+			// 리스트 치환 부분
+			resultList.stream().forEach(t->{
+				if("A".equals(t.getSendKind())) {
+					t.setSendKind("API");				
+				}else {
+					t.setSendKind("WEB");				
+				}
+			});
+			
 	        model.addAttribute("resultList", resultList);
 	        
 	        //알림톡발송 실패 결과 코드정보 리스트 불러오기
diff --git a/src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java b/src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java
index 527f146..d26e1e5 100644
--- a/src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java
+++ b/src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java
@@ -259,6 +259,8 @@ public class KakaoVO extends MjonMsgVO{
 	private String msgResendAllGroupId;
 	private String msgResendAllTmpKey;
 	private String msgResendAllYellowId;
+	
+	private String sendKind;
 
 	private List<Map<String, String>> varListMap;
 
diff --git a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml
index 3c675e5..a2bc46f 100644
--- a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml
@@ -2593,7 +2593,8 @@
 			l.MBER_NM					AS userNm,
 			l.AT_SMISHING_YN			AS atSmishingYn,
 			l.VIP_YN					AS vipYn,
-			IFNULL(MD.successCount, 0) as successCount
+			IFNULL(MD.successCount, 0) as successCount,
+			MMGD.SEND_KIND as sendKind 
 		FROM
 			mj_msg_group_data MMGD
 		LEFT JOIN lettngnrlmber l
@@ -2677,6 +2678,15 @@
 					AND MMGD.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%')
 				</isEqual>
 			</isNotEmpty>
+			
+			<isNotEmpty property="searchCondition3" prepend="AND">
+				<isEqual property="searchCondition3" compareValue="10">
+					MMGD.SEND_KIND ='H'
+				</isEqual>
+				<isEqual property="searchCondition3" compareValue="20">
+					MMGD.SEND_KIND ='A'
+				</isEqual>
+			</isNotEmpty>
 		ORDER BY
 			CASE
 				WHEN MMGD.AT_DELAY_YN = 'Y'
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp
index 44867b8..e93cdf6 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp
@@ -612,16 +612,23 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) {
 					<option value="N" <c:if test="${searchVO.searchCondition2 == 'N'}">selected="selected"</c:if>>즉시</option>
 					<option value="Y" <c:if test="${searchVO.searchCondition2 == 'Y'}">selected="selected"</c:if>>예약</option>
 				</select>
-					
-				<%-- <ec:select codeId="ITN023" name="searchCondition3" id="searchCondition3" css="class='select'" selectedValue="${searchVO.searchCondition3}"
+
+					<%-- <ec:select codeId="ITN023" name="searchCondition3" id="searchCondition3" 
+					css="class='select'" selectedValue="${searchVO.searchCondition2}"
 					defaultValue="" defaultText="삭제여부(전체)"  /> --%>
 
+
 				<select name="msgType" id="msgType"  title="메시지 타입">
 					<option value="" <c:if test="${empty searchVO.msgType }">selected="selected"</c:if> >메시지 타입(전체)</option>
 					<option value="8" <c:if test="${searchVO.msgType == '8'}">selected="selected"</c:if>>알림톡</option>
 					<option value="9" <c:if test="${searchVO.msgType == '9'}">selected="selected"</c:if>>친구톡</option>
 				</select>	            
 					
+
+				<ec:select codeId="CCM040" name="searchCondition3" css="class='select'" 
+					selectedValue="${searchVO.searchCondition3}"
+					defaultValue="" defaultText="발송방식 전체" />
+					
 				<input id="searchKeyword" name="searchKeyword" class="recentSearch" type="text" value="<c:out value='${searchVO.searchKeyword}'/>" size="15" title="검색" maxlength="100" />
 				<input type="button" class="btnType1" value="검색" onclick="fn_search(); return false;">
 
@@ -655,6 +662,7 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) {
 						<col style="width: 5%">
 						<col style="width: auto">
 						<col style="width: 7%">
+						<col style="width: 7%">
 					</colgroup>
 					<thead>
 						<tr>
@@ -668,6 +676,7 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) {
 							<th>예약<input type="button" class="sort sortBtn" id="sort_reserveYn"></th>
 							<th>내용<input type="button" class="sort sortBtn" id="sort_smsTxt"></th>
 							<th>타입<input type="button" class="sort sortBtn" id="sort_msgType"></th>
+							<th>방식<input type="button" class="sort sortBtn" id="sort_sendkind"></th>
 						</tr>
 					</thead>
 					<tbody>
@@ -778,6 +787,9 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) {
 							<td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
 								<c:out value="${result.msgTypeName}"/>
 							</td>
+							<td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
+								<c:out value="${result.sendKind}"/>
+							</td>
 						</tr>
 						</c:forEach>
 						<c:if test="${empty resultList}">