Merge branch 'master' of
http://tolag3@vcs.iten.co.kr:9999/hylee/mjon_git into master_tolag3 발송상세 목록 버튼 검색조건 이어지도록 수정
This commit is contained in:
parent
e8c19d0f8a
commit
e7cef9aea2
@ -1,26 +1,23 @@
|
||||
package itn.let.kakao.user.sent.web;
|
||||
|
||||
import java.io.FileReader;
|
||||
import java.io.OutputStream;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import itn.com.cmm.util.DateUtils;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.apache.poi.ss.usermodel.Cell;
|
||||
import org.apache.poi.ss.usermodel.CellStyle;
|
||||
import org.apache.poi.ss.usermodel.Font;
|
||||
import org.apache.poi.ss.usermodel.Row;
|
||||
import org.apache.poi.ss.usermodel.Sheet;
|
||||
import org.apache.poi.ss.util.CellRangeAddress;
|
||||
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
|
||||
import org.json.simple.JSONArray;
|
||||
import org.json.simple.JSONObject;
|
||||
import org.json.simple.parser.JSONParser;
|
||||
@ -117,26 +114,16 @@ public class KakaoSentController {
|
||||
if(kakaoSentVO.getSearchSortCnd().equals("")) kakaoSentVO.setSearchSortCnd("regdate");
|
||||
|
||||
|
||||
String startDate = kakaoSentVO.getStartDate();
|
||||
|
||||
String startDate = kakaoSentVO.getStartDate();
|
||||
String endDate = kakaoSentVO.getEndDate();
|
||||
|
||||
if(startDate == null && endDate == null ) {
|
||||
if(StringUtils.isEmpty(startDate)
|
||||
&& StringUtils.isEmpty(endDate))
|
||||
{
|
||||
|
||||
Calendar cal = Calendar.getInstance();
|
||||
Date now = new Date();
|
||||
|
||||
SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
|
||||
|
||||
//종료일은 오늘날짜
|
||||
cal.setTime(now);
|
||||
endDate = format.format(cal.getTime());
|
||||
|
||||
//시작일은 전날로 셋팅
|
||||
cal.add(Calendar.DATE, -89);
|
||||
startDate = format.format(cal.getTime());
|
||||
|
||||
kakaoSentVO.setStartDate(startDate);
|
||||
kakaoSentVO.setEndDate(endDate);
|
||||
kakaoSentVO.setStartDate(DateUtils.getDateMonthsAgo(3));
|
||||
kakaoSentVO.setEndDate(DateUtils.getCurrentDate());
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -104,15 +104,6 @@ function fnReservCancel(msgGroupId){
|
||||
|
||||
}
|
||||
|
||||
function fn_sentDetailView(msgGroupId) {
|
||||
// msgGroupId 값을 form에 설정
|
||||
$("#searchForm #msgGroupId").val(msgGroupId);
|
||||
|
||||
// form을 해당 URL로 제출
|
||||
$("#searchForm").attr("action", "/web/kakao/sent/selectKakaoSentDetailView.do");
|
||||
$("#searchForm").submit();
|
||||
}
|
||||
|
||||
</script>
|
||||
<div class="list_info">
|
||||
<p>총 발송건수 <span class="c_e40000"><c:out value="${totalRecordCount}"/></span>건</p>
|
||||
|
||||
@ -796,7 +796,7 @@ function previewPhone(){
|
||||
|
||||
<!-- 목록-->
|
||||
<div class="btn_list_type1">
|
||||
<button class="btnType btnType17">목록</button>
|
||||
<button class="btnType btnType17" id="goPageBtn">목록</button>
|
||||
</div>
|
||||
<!--// 목록-->
|
||||
|
||||
@ -889,14 +889,14 @@ function previewPhone(){
|
||||
<!--// 주소록에 등록 팝업 -->
|
||||
|
||||
<!-- 이전 리스트 상태(검색조건, 페이징) 그대로 가기 위한 form -->
|
||||
<form id="goList" name="goList" method="post" action="/web/mjon/msgsent/selectMsgSentView.do">
|
||||
<form id="goList" name="goList" method="post" action="/web/kakao/sent/selectKakaoSentView.do">
|
||||
<input type="hidden" name="pageIndex" value="<c:out value="${searchVO.pageIndex}" />" />
|
||||
<input type="hidden" name="searchSortCnd" value="<c:out value='${searchVO.searchSortCnd }' />" />
|
||||
<input type="hidden" name="searchSortOrd" value="<c:out value='${searchVO.searchSortOrd }' />" />
|
||||
<input type="hidden" name="searchCondition01" value="<c:out value='${searchVO.searchCondition01 }' />" />
|
||||
<input type="hidden" name="searchCondition02" value="<c:out value='${searchVO.searchCondition02 }' />" />
|
||||
<input type="hidden" name="searchStartDate" value="<c:out value='${searchVO.searchStartDate }' />" />
|
||||
<input type="hidden" name="searchEndDate" value="<c:out value='${searchVO.searchEndDate }' />" />
|
||||
<input type="hidden" name="startDate" value="<c:out value='${searchVO.startDate }' />" />
|
||||
<input type="hidden" name="endDate" value="<c:out value='${searchVO.endDate }' />" />
|
||||
<input type="hidden" name="searchCondition" value="<c:out value='${searchVO.searchCondition }' />" />
|
||||
<input type="hidden" name="searchKeyword" value="<c:out value='${searchVO.searchKeyword }' />" />
|
||||
<input type="hidden" name="pageUnit" value="<c:out value='${searchVO.pageUnit }' />" />
|
||||
|
||||
@ -21,7 +21,7 @@ $(document).ready(function(){
|
||||
//초기 전체 리스트 페이지 보여주기
|
||||
var form = document.searchForm;
|
||||
form.listType.value = "groupList";
|
||||
linkPage(1);
|
||||
linkPage(<c:out value="${searchVO.pageIndex}"/>);
|
||||
|
||||
var date = new Date() ;
|
||||
//이전달 첫날/마지막날 조회
|
||||
@ -246,33 +246,6 @@ $(document).on('click', '.msgGgoupList', function(){
|
||||
|
||||
});
|
||||
|
||||
function fnReSendMsg(){
|
||||
|
||||
var msgSeq = [];
|
||||
if($("input:checkbox[name='msgSentDel']").is(":checked")==false){
|
||||
alert("선택된 항목이 없습니다.");
|
||||
return;
|
||||
}
|
||||
|
||||
$("input:checkbox[name='msgSentDel']:checked").each(function(index){
|
||||
|
||||
var disabledChk = $(this).prop('disabled');
|
||||
if(!disabledChk){ //checkbox disabled 인 것은 제외하고 아이디 저장
|
||||
|
||||
msgSeq[index] = $(this).val();
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
var form = document.reSendForm;
|
||||
form.msgSeqList.value = msgSeq;
|
||||
form.msgResendFlag.value = "Y";
|
||||
|
||||
form.action="/web/mjon/msgdata/selectMsgDataView.do";
|
||||
form.submit();
|
||||
|
||||
}
|
||||
|
||||
/* 사용내역서 클릭 시 내역서 새창 팝업 오픈 */
|
||||
function fnShowPrintPopup(tabType, type) {
|
||||
//만들려는 팝업의 크기
|
||||
@ -382,6 +355,18 @@ function fnDelete(){
|
||||
|
||||
}
|
||||
|
||||
function fn_sentDetailView(msgGroupId) {
|
||||
// msgGroupId 값을 form에 설정
|
||||
$("#searchForm #msgGroupId").val(msgGroupId);
|
||||
|
||||
$('#ntceBgnde').val($('#startDate').val());
|
||||
$('#ntceEndde').val($('#endDate').val());
|
||||
|
||||
// form을 해당 URL로 제출
|
||||
$("#searchForm").attr("action", "/web/kakao/sent/selectKakaoSentDetailView.do");
|
||||
$("#searchForm").submit();
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
@ -426,7 +411,9 @@ function fnDelete(){
|
||||
<!--// tab button -->
|
||||
</div>
|
||||
<form id="searchForm" name="searchForm" method="post">
|
||||
<input type="hidden" id="pageIndex" name="pageIndex" value="1"/>
|
||||
<input type="hidden" id="pageIndex" name="pageIndex" value="<c:out value="${searchVO.pageIndex}" />"/>
|
||||
<%-- <input type="hidden" id="pageIndex" name="pageIndex" value="<c:out value="${searchVO.pageIndex}" />" /> --%>
|
||||
<input type="hidden" id="pageUnit" name="pageUnit" value="<c:out value="${searchVO.pageUnit}" />" />
|
||||
<input type="hidden" id="msgGroupIdList" name="msgGroupIdList" value=""/>
|
||||
<input type="hidden" name="searchSortCnd" value="<c:out value="${searchVO.searchSortCnd}" />" />
|
||||
<input type="hidden" name="searchSortOrd" value="<c:out value="${searchVO.searchSortOrd}" />" />
|
||||
@ -649,10 +636,6 @@ function fnDelete(){
|
||||
<input type="hidden" id="fileCnt" name="fileCnt" value=""/>
|
||||
<input type="hidden" id="resultType" name="resultType" value="S"/>
|
||||
</form>
|
||||
<form id="reSendForm" name="reSendForm" method="post">
|
||||
<input type="hidden" id="msgSeqList" name="msgSeqList" value=""/>
|
||||
<input type="hidden" id="msgResendFlag" name="msgResendFlag" value="N"/>
|
||||
</form>
|
||||
<form name="popForm" id="popForm" method="post">
|
||||
<input type="hidden" name="pageType" id="pageType" value=""/>
|
||||
</form>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user