diff --git a/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java b/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java index e93b50d9..5dc1b8a4 100644 --- a/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java +++ b/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java @@ -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()); } diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp index 3e9e4ea5..9ef54863 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp @@ -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(); -} -

총 발송건수

diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp index c00dd4d1..92cd1c47 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp @@ -796,7 +796,7 @@ function previewPhone(){
- +
@@ -889,14 +889,14 @@ function previewPhone(){ -
+ " /> - - + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp index cc94834b..4a85e26b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp @@ -21,7 +21,7 @@ $(document).ready(function(){ //초기 전체 리스트 페이지 보여주기 var form = document.searchForm; form.listType.value = "groupList"; - linkPage(1); + linkPage(); 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(); +} + @@ -426,7 +411,9 @@ function fnDelete(){
- + "/> +<%-- " /> --%> + " /> " /> " /> @@ -649,10 +636,6 @@ function fnDelete(){ -
- - -