카톡전송리스트(전체) 메뉴에 발송방식 (WEB,API) 검색조건 추가
This commit is contained in:
parent
410700b834
commit
5ec476e721
@ -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);
|
||||
|
||||
//알림톡발송 실패 결과 코드정보 리스트 불러오기
|
||||
|
||||
@ -260,6 +260,8 @@ public class KakaoVO extends MjonMsgVO{
|
||||
private String msgResendAllTmpKey;
|
||||
private String msgResendAllYellowId;
|
||||
|
||||
private String sendKind;
|
||||
|
||||
private List<Map<String, String>> varListMap;
|
||||
|
||||
@Override
|
||||
|
||||
@ -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'
|
||||
|
||||
@ -613,15 +613,22 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) {
|
||||
<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}">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user