tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wyh'

Browse Source
This commit is contained in:
name 2023-08-02 14:11:21 +09:00
commit b0fdb13d8a
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
View File

@ -610,6 +610,7 @@
, M.userNm
, M.adminSmsNoticeYn
, M.callFrom
, M.sendKind
, M.smsTxt
, M.subject
, M.msgType
@ -725,6 +726,7 @@
, A.USER_ID AS userId
, LMB.MBER_NM AS userNm
, LMB.ADMIN_SMS_NOTICE_YN AS adminSmsNoticeYn
, A.SEND_KIND AS sendKind
, A.CALL_FROM AS callFrom
, A.SMS_TXT AS smsTxt
, A.SUBJECT AS subject
@ -785,7 +787,15 @@
WHEN RESERVE_YN = 'Y'
THEN (REQ_DATE <= NOW() OR (IFNULL(DELAY_YN, 'N') = 'Y' AND IFNULL(DELAY_COMPLETE_YN, 'N') = 'N'))
END
]]>
]]>
<isNotEmpty property="sendKind">
<isEqual property="sendKind" compareValue="H">
AND A.SEND_KIND = 'H'
</isEqual>
<isEqual property="sendKind" compareValue="A">
AND A.SEND_KIND = 'A'
</isEqual>
</isNotEmpty>
<isNotEmpty property="searchKeyword">
<isEqual property="searchCondition" compareValue="" >
AND (

2
src/main/webapp/WEB-INF/jsp/uss/ion/msg/ReserveNumberList.jsp
View File

@ -359,7 +359,7 @@ function fnSmishingUpdate(flag) {
<option value="" <c:if test="${empty searchVO.searchAdminSmsNoticeYn }">selected="selected"</c:if> >법인폰 알림여부</option>
<option value="Y" <c:if test="${searchVO.searchAdminSmsNoticeYn == 'Y'}">selected="selected"</c:if>>온(On)</option>
<option value="N" <c:if test="${searchVO.searchAdminSmsNoticeYn == 'N'}">selected="selected"</c:if>>오프(Off)</option>
</select>
</select>
<select id="sendKind" name="sendKind" onchange="fn_search();">
<option value=""<c:if test="${searchVO.sendKind eq ''}">selected="selected"</c:if>>발송방식 전체</option>
<option value="H"<c:if test="${searchVO.sendKind eq 'H'}">selected="selected"</c:if>>WEB</option>

19
src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp
View File

@ -430,8 +430,12 @@ function fnSmishingUpdate(flag) {
<option value="" <c:if test="${empty searchVO.searchAdminSmsNoticeYn }">selected="selected"</c:if> >법인폰 알림여부</option>
<option value="Y" <c:if test="${searchVO.searchAdminSmsNoticeYn == 'Y'}">selected="selected"</c:if>>온(On)</option>
<option value="N" <c:if test="${searchVO.searchAdminSmsNoticeYn == 'N'}">selected="selected"</c:if>>오프(Off)</option>
</select>
</select>
<select id="sendKind" name="sendKind" onchange="fn_search();">
<option value=""<c:if test="${searchVO.sendKind eq ''}">selected="selected"</c:if>>발송방식 전체</option>
<option value="H"<c:if test="${searchVO.sendKind eq 'H'}">selected="selected"</c:if>>WEB</option>
<option value="A"<c:if test="${searchVO.sendKind eq 'A'}">selected="selected"</c:if>>API</option>
</select>
<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;">
@ -479,6 +483,7 @@ function fnSmishingUpdate(flag) {
<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_agentCodeTxt"></th> -->
<!-- <th>통신사<input type="button" class="sort sortBtn" id="sort_rsltNet"></th> -->
</tr>
@ -643,6 +648,16 @@ function fnSmishingUpdate(flag) {
</c:otherwise>
</c:choose>
</td>
<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</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:out value="${result.conectMthdTxt}"/></td> --%>
<%-- <td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
<c:out value="${result.agentCodeTxt}"/>