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(); -} -
총 발송건수