diff --git a/src/main/java/itn/com/cmm/util/DateUtil.java b/src/main/java/itn/com/cmm/util/DateUtil.java index c1f70068..4e9c8dfb 100644 --- a/src/main/java/itn/com/cmm/util/DateUtil.java +++ b/src/main/java/itn/com/cmm/util/DateUtil.java @@ -135,6 +135,16 @@ public final class DateUtil { } + /** + * @methodName : dateChkAndValueChk + * @author : 이호영 + * @date : 2024.07.05 + * @description : 검색 날짜 검증 및 일수 체크 + * @param searchStartDate + * @param searchEndDate + * @param dateVal + * @return + */ public static boolean dateChkAndValueChk(String searchStartDate, String searchEndDate, int dateVal) { @@ -174,6 +184,7 @@ public final class DateUtil { isValid = false; } } + System.out.println("isValid : "+ isValid); return isValid; } diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java index 47abade8..7677df66 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -1940,6 +1940,8 @@ public class MjonPayController { model.addAttribute("prePaymentYn", userManageVO.getPrePaymentYn()); + + System.out.println("pattern :: "+ pattern); if(pattern.equals("/web/member/pay/PayListAllAjax.do") || pattern.equals("/web/member/pay/PayListMobileAjax.do") || pattern.equals("/web/member/pay/PayListCardAjax.do") @@ -2013,9 +2015,14 @@ public class MjonPayController { model.addAttribute("resultRefundVO", resultRefundVO); - refundVO.setStartDate(mjonPayVO.getStartDate()); - refundVO.setEndDate(mjonPayVO.getEndDate()); - + + { + // 초기 날짜 셋팅 + model.addAttribute("startDate", DateUtil.getDateDaysAgo(365)); + model.addAttribute("endDate", DateUtil.getCurrentDate()); + } + + //환불 요청 리스트 조회하기 List refundList = refundService.selectRefundList(refundVO); int totCnt = 0; @@ -2097,16 +2104,25 @@ public class MjonPayController { voComCode.setCodeId("ITN031"); model.addAttribute("emailCode", cmmUseService.selectCmmCodeDetail(voComCode)); + +// mjonPayVO.setStartDate(mjonPayVO.getStartDate() == null ? DateUtil.getDateDaysAgo(365) : mjonPayVO.getStartDate()); +// mjonPayVO.setEndDate(mjonPayVO.getEndDate() == null ? DateUtil.getCurrentDate() : mjonPayVO.getEndDate()); + + if(!DateUtil.dateChkAndValueChk(mjonPayVO.getSearchStartDate(),mjonPayVO.getSearchEndDate(), 365 )) { + mjonPayVO.setStartDate(DateUtil.getDateDaysAgo(365)); + mjonPayVO.setEndDate(DateUtil.getCurrentDate()); + }; + + //결제 리스트 정보 불러오기 List resultList = mjonPayService.selectPayList(mjonPayVO); model.addAttribute("resultList", resultList); paginationInfo.setTotalRecordCount(resultList.size() > 0 ? ((MjonPayVO)resultList.get(0)).getTotCnt() : 0); model.addAttribute("paginationInfo", paginationInfo); - + return "/web/pay/PayListAllAjax"; } - return "/web/pay/PayList"; } diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp index 9abc6698..3a802550 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp @@ -53,6 +53,11 @@ function listLoad(subpage , searchFlag ){ } function linkPage(pageNo){ + + if(!fn_cmndataValueChk("startDate", "endDate", 365)){ + return; + }; + //날자 체크 if( $('#startDate').val() != '' && $('#endDate').val() != '' ){ var iChkBeginDe = Number($('#startDate').val().replaceAll("/", "")); diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayListRefundAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayListRefundAjax.jsp index 5e145f4f..c4d71cf5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayListRefundAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayListRefundAjax.jsp @@ -402,6 +402,8 @@ function fn_checkForm() { } function rfLinkPage(pageNo){ + + var form = document.listForm; form.pageIndex.value = pageNo;