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

Merge branch 'master_tolag3'

Browse Source
This commit is contained in:
leejunho 2025-04-09 12:49:59 +09:00
commit fe3ac16535
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java
View File

@ -132,7 +132,7 @@ public class KakaoSentController {
endDate = format.format(cal.getTime()); endDate = format.format(cal.getTime());
//시작일은 전날로 셋팅 //시작일은 전날로 셋팅
cal.add(Calendar.DATE, -90); cal.add(Calendar.DATE, -89);
startDate = format.format(cal.getTime()); startDate = format.format(cal.getTime());
kakaoSentVO.setStartDate(startDate); kakaoSentVO.setStartDate(startDate);

4
src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp
View File

@ -147,7 +147,7 @@ function fn_sentDetailView(msgGroupId) {
<tr> <tr>
<th rowspan="2"> <th rowspan="2">
<label for="" class="label">전체 선택</label> <label for="" class="label">전체 선택</label>
<input type="checkbox"> <input type="checkbox" id="allCheck" name="allCheck">
</th> </th>
<th rowspan="2">발송일시 <th rowspan="2">발송일시
<div class="sort_wrap"> <div class="sort_wrap">
@ -290,7 +290,7 @@ function fn_sentDetailView(msgGroupId) {
<button type="button" onclick="javascript:fnDelete(); return false;" class="btnType btnType15"><i class="remove_img"></i>선택삭제</button> <button type="button" onclick="javascript:fnDelete(); return false;" class="btnType btnType15"><i class="remove_img"></i>선택삭제</button>
</div> </div>
<div class="table_btn_right"> <div class="table_btn_right">
<button type="button" class="excel_btn btnType"><i class="downroad"></i>발송결과 리스트</button> <button type="button" class="excel_btn btnType" onClick="javascript:fnExcelDownLoad(); return false;"><i class="downroad"></i>발송결과 리스트</button>
</div> </div>
</div> </div>

4
src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp
View File

@ -570,10 +570,10 @@ function fnDelete(){
<ul class="list_tab"> <ul class="list_tab">
<li class="tab active"><button type="button" onclick="fnTabLoad('',0); return false;">전체</button></li> <li class="tab active"><button type="button" onclick="fnTabLoad('',0); return false;">전체</button></li>
<li class="tab"><button type="button" onclick="fnTabLoad('at', 1); return false;">알림톡</button></li> <li class="tab"><button type="button" onclick="fnTabLoad('at', 1); return false;">알림톡</button></li>
<c:if test="${pageContext.request.serverName == 'localhost' <%-- <c:if test="${pageContext.request.serverName == 'localhost'
|| pageContext.request.serverName == '119.193.215.98'}"> || pageContext.request.serverName == '119.193.215.98'}">
<li class="tab"><button type="button" onclick="fnTabLoad('ft', 2); return false;">친구톡</button></li> <li class="tab"><button type="button" onclick="fnTabLoad('ft', 2); return false;">친구톡</button></li>
</c:if> </c:if> --%>
</ul><!--// tab button --> </ul><!--// tab button -->
</div> </div>
<!-- 예약관리 > 전체 --> <!-- 예약관리 > 전체 -->