From c041820148054a1ea708cb0589c34551b237a18c Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Wed, 28 Aug 2024 10:36:23 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EA=B4=80=EB=A6=AC=20>=20?=
 =?UTF-8?q?=EC=95=8C=EB=A6=BC=20=EB=AF=B8=EC=B2=98=EB=A6=AC=20=EB=AC=B8?=
 =?UTF-8?q?=EC=9E=90=20=EC=A1=B0=ED=9A=8C=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EB=B3=80=EA=B2=BD=20=20-=20=ED=9A=8C?=
 =?UTF-8?q?=EC=9B=90=EC=83=81=ED=83=9C=20=EA=B2=80=EC=83=89=20=EC=98=B5?=
 =?UTF-8?q?=EC=85=95=20=EC=B6=94=EA=B0=80=20=20-=20=EB=A6=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EB=82=B4=EC=9A=A9=20=EC=A0=95=EB=B3=B4=20=EC=BB=AC?=
 =?UTF-8?q?=EB=9F=BC=20=EB=B3=80=EA=B2=BD(=ED=9A=8C=EC=9B=90=EC=83=81?=
 =?UTF-8?q?=ED=83=9C=20=EC=BB=AC=EB=9F=BC=20=EC=82=AD=EC=A0=9C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/mjo/msg/web/MjonMsgController.java    |  2 +-
 .../sqlmap/let/msg/MjonMsgData_SQL_mysql.xml  | 11 ++++
 .../jsp/uss/ion/msg/SendHoliMsgList.jsp       | 51 ++++++++++---------
 3 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
index 7ddb1ab8..43d09937 100644
--- a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
+++ b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
@@ -1305,7 +1305,7 @@ public class MjonMsgController {
        model.addAttribute("resultMsgCodeList", resultMsgCodeList);
        
        paginationInfo.setTotalRecordCount(resultList.size() > 0 ? ((MjonMsgVO)resultList.get(0)).getTotCnt() : 0);
-		model.addAttribute("paginationInfo", paginationInfo);
+       model.addAttribute("paginationInfo", paginationInfo);
 		
 		return "/uss/ion/msg/SendHoliMsgList";
        
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 1ab8e818..ccb3ec76 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
@@ -7800,6 +7800,17 @@
 						AND mmgd.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%')
 					</isEqual>
 				</isNotEmpty>
+				<isNotEmpty property="mberSttus">
+					<isEqual property="mberSttus" compareValue="Y">
+						AND lmb.MBER_STTUS = 'Y'
+					</isEqual>
+					<isEqual property="mberSttus" compareValue="N">
+						AND lmb.MBER_STTUS = 'N'
+					</isEqual>
+					<isEqual property="mberSttus" compareValue="B">
+						AND lmb.MBER_STTUS = 'B'
+					</isEqual>
+				</isNotEmpty>
 				<isNotEmpty property="searchCondition3">
 	       			<isEqual property="searchCondition3" compareValue="1">
 						AND mmgd.MSG_TYPE = '4'
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendHoliMsgList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendHoliMsgList.jsp
index ab82993f..254b1453 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendHoliMsgList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendHoliMsgList.jsp
@@ -411,6 +411,13 @@ function fnMsgStatusUpdt(){
 					</a>		    				
 				</div>
 				<br /><br />
+				<select name="mberSttus" class="select" title="회원상태(전체)" onchange="fn_search();">
+					<option value="" <c:if test="${searchVO.mberSttus == ''}">selected="selected"</c:if>>회원상태(전체)</option>
+					<option value="Y" <c:if test="${searchVO.mberSttus == 'Y'}">selected="selected"</c:if>>일반</option>
+					<option value="N" <c:if test="${searchVO.mberSttus == 'N'}">selected="selected"</c:if>>탈퇴</option>
+					<option value="B" <c:if test="${searchVO.mberSttus == 'B'}">selected="selected"</c:if>>이용정지</option>
+				</select>
+				
 				<select name="searchCondition" class="select" title="검색조건 선택">
 					<option value="" <c:if test="${searchVO.searchCondition == ''}">selected="selected"</c:if>>ID/내용/발신번호(전체)</option>
 					<option value="1" <c:if test="${searchVO.searchCondition == '1'}">selected="selected"</c:if>>사용자ID</option>
@@ -418,9 +425,6 @@ function fnMsgStatusUpdt(){
 					<option value="3" <c:if test="${searchVO.searchCondition == '3'}">selected="selected"</c:if>>전송내용</option>
 				</select>
 				
-				<%-- <ec:select codeId="ITN019" name="searchCondition2" id="searchCondition2" css="class='select'" selectedValue="${searchVO.searchCondition2}"
-					defaultValue="" defaultText="전송사(전체)"  /> --%>
-					
 				<select name="searchCondition3" class="select" title="메세지타입(전체)" onchange="fn_search();">
 					<option value="" <c:if test="${searchVO.searchCondition3 == ''}">selected="selected"</c:if>>메세지타입(전체)</option>
 					<option value="1" <c:if test="${searchVO.searchCondition3 == '1'}">selected="selected"</c:if>>단문</option>
@@ -428,7 +432,6 @@ function fnMsgStatusUpdt(){
 					<option value="3" <c:if test="${searchVO.searchCondition3 == '3'}">selected="selected"</c:if>>그림</option>
 					<option value="8" <c:if test="${searchVO.searchCondition3 == '8'}">selected="selected"</c:if>>알림톡</option>
 					<option value="9" <c:if test="${searchVO.searchCondition3 == '9'}">selected="selected"</c:if>>친구톡</option>
-					
 				</select>
 					
 				<select name="cancelResultYn" id="cancelResultYn"  title="처리상태" onchange="fn_search();">
@@ -468,7 +471,7 @@ function fnMsgStatusUpdt(){
 						<col style="width: 3%">
 						<col style="width: 5%">
 						<col style="width: 15%">
-						<col style="width: 5%">
+						<%-- <col style="width: 5%"> --%>
 						<col style="width: 7%">
 						<col style="width: 8%">
 						<col style="width: 10%">
@@ -487,16 +490,16 @@ function fnMsgStatusUpdt(){
 							<th><input type="checkbox" name="checkAll" id="checkAll" onclick="fnCheckAll();" /><label for="checkAll"></label></th>
 							<th>번호<input type="button" class="sort sortBtn" id="sort_msgGroupId"></th>
 							<th>아이디<input type="button" class="sort sortBtn" id="sort_userId"></th>
-							<th>회원상태<input type="button" class="sort sortBtn" id="sort_adminSmsNoticeYn"></th>
+							<!-- <th>회원상태<input type="button" class="sort sortBtn" id="sort_adminSmsNoticeYn"></th> -->
 							<th>발신번호<input type="button" class="sort sortBtn" id="sort_callFrom"></th>
 							<th>발송건수<input type="button" class="sort sortBtn" id="sort_msgGroupCnt"></th>
 							<th>요청시간<input type="button" class="sort sortBtn" id="sort_reqDate"></th>
 							<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_msgTypeTxt"></th>
-							<th>방식<input type="button" class="sort sortBtn" id="sort_sendKind"></th>
-							<th>등록일자<input type="button" class="sort sortBtn" id="sort_frstRegistPnttm"></th>
 							<th>처리상태<input type="button" class="sort sortBtn" id="sort_cancelResultYn"></th>
+							<th>등록일자<input type="button" class="sort sortBtn" id="sort_frstRegistPnttm"></th>
+							<th>방식<input type="button" class="sort sortBtn" id="sort_sendKind"></th>
 							<!-- <th>예약상태<input type="button" class="sort sortBtn" id="sort_conectMthdTxt"></th> -->
 							<!-- 
 							<th>취소일자<input type="button" class="sort sortBtn" id="sort_agentCodeTxt"></th>
@@ -524,7 +527,7 @@ function fnMsgStatusUpdt(){
 									(<c:out value="${result.userNm}"/>)
 								</a>
 							</td>
-		                    <td <c:if test="${result.smishingYn eq 'Y'}">style="color: #0000FF; cursor:pointer;"</c:if>>
+		                    <%-- <td <c:if test="${result.smishingYn eq 'Y'}">style="color: #0000FF; cursor:pointer;"</c:if>>
 		                    	<c:choose>
 		                    		<c:when test="${result.mberSttus eq 'Y'}">
 		                    			일반
@@ -539,7 +542,7 @@ function fnMsgStatusUpdt(){
 		                    			기타(${result.mberSttus})
 		                    		</c:otherwise>
 		                    	</c:choose>
-		                    </td>										
+		                    </td>		 --%>								
 							<td onclick="fn_detail_list('${result.msgGroupId}'); return false;" <c:if test="${result.smishingYn eq 'Y'}">style="color: #0000FF; cursor:pointer;"</c:if><c:if test="${result.smishingYn eq 'N'}">style="cursor:pointer;"</c:if>>
 								<a href="#" onclick="fn_detail_list('${result.msgGroupId}'); return false;">
 									<c:out value="${result.callFrom}"/>
@@ -637,19 +640,6 @@ function fnMsgStatusUpdt(){
 									</c:otherwise>
 								</c:choose>																							
 							</td>
-							<td <c:if test="${result.smishingYn eq 'Y'}">style="color: #0000FF; cursor:pointer;"</c:if>>
-								<c:choose>
-									<c:when test="${result.sendKind eq 'A'}">
-										API
-									</c:when>
-									<c:when test="${result.sendKind eq 'H'}">
-										WEB
-									</c:when>
-								</c:choose>
-							</td>
-							<td <c:if test="${result.smishingYn eq 'Y'}">style="color: #0000FF; cursor:pointer;"</c:if>>
-								<c:out value="${result.frstRegistPnttm}"/>
-							</td>
 							<td <c:if test="${result.smishingYn eq 'Y'}">style="color: #0000FF; cursor:pointer;"</c:if>>
 								<c:choose>
 									<c:when test="${result.cancelResultYn eq 'Y'}">
@@ -667,10 +657,23 @@ function fnMsgStatusUpdt(){
 									
 								</c:choose>
 							</td>
+							<td <c:if test="${result.smishingYn eq 'Y'}">style="color: #0000FF; cursor:pointer;"</c:if>>
+								<c:out value="${result.frstRegistPnttm}"/>
+							</td>
+							<td <c:if test="${result.smishingYn eq 'Y'}">style="color: #0000FF; cursor:pointer;"</c:if>>
+								<c:choose>
+									<c:when test="${result.sendKind eq 'A'}">
+										API
+									</c:when>
+									<c:when test="${result.sendKind eq 'H'}">
+										WEB
+									</c:when>
+								</c:choose>
+							</td>
 						</tr>
 						</c:forEach>
 						<c:if test="${empty resultList}">
-		         			<tr><td colspan="13"><spring:message code="common.nodata.msg" /></td></tr>
+		         			<tr><td colspan="11"><spring:message code="common.nodata.msg" /></td></tr>
 		         		</c:if>    
 					</tbody>
 				</table>