From 5c2f7f5e7317732e5c9709dfdcfae4fb6219613b Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 5 Jul 2024 09:48:06 +0900 Subject: [PATCH] =?UTF-8?q?fn=5FcmndataValueChk=20=EB=AA=A8=EB=93=88=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/itn/com/cmm/util/DateUtil.java | 4 ++-- .../let/mjo/msgCustom/web/MjonMsgCustomWebController.java | 2 +- src/main/java/itn/let/mjo/pay/web/MjonPayController.java | 2 +- src/main/webapp/publish/js/cmnDateAndChk.js | 8 +++++++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/itn/com/cmm/util/DateUtil.java b/src/main/java/itn/com/cmm/util/DateUtil.java index 895b5f79..c1f70068 100644 --- a/src/main/java/itn/com/cmm/util/DateUtil.java +++ b/src/main/java/itn/com/cmm/util/DateUtil.java @@ -135,7 +135,7 @@ public final class DateUtil { } - public static boolean dateChk365AndValueChk(String searchStartDate, String searchEndDate) { + public static boolean dateChkAndValueChk(String searchStartDate, String searchEndDate, int dateVal) { boolean isValid = true; @@ -170,7 +170,7 @@ public final class DateUtil { // 총 기간이 365일을 넘는지 확인 if (isValid) { long daysBetween = ChronoUnit.DAYS.between(startDate, endDate); - if (daysBetween > 365) { + if (daysBetween > dateVal) { isValid = false; } } diff --git a/src/main/java/itn/let/mjo/msgCustom/web/MjonMsgCustomWebController.java b/src/main/java/itn/let/mjo/msgCustom/web/MjonMsgCustomWebController.java index b692ceb9..29a5dfc3 100644 --- a/src/main/java/itn/let/mjo/msgCustom/web/MjonMsgCustomWebController.java +++ b/src/main/java/itn/let/mjo/msgCustom/web/MjonMsgCustomWebController.java @@ -229,7 +229,7 @@ public class MjonMsgCustomWebController { // 검색 데이터가 없거나 // 시작일자가 종료일자보다 이후이거나 // 총 기간이 365일이 넘으면 현재일부터 365일 전 날짜를 넣어서 검색 - if(!DateUtil.dateChk365AndValueChk(mjonMsgCustomVO.getSearchStartDate(),mjonMsgCustomVO.getSearchEndDate() )) { + if(!DateUtil.dateChkAndValueChk(mjonMsgCustomVO.getSearchStartDate(),mjonMsgCustomVO.getSearchEndDate(), 365 )) { mjonMsgCustomVO.setSearchStartDate(DateUtil.getDateDaysAgo(365)); mjonMsgCustomVO.setSearchEndDate(DateUtil.getCurrentDate()); 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 68f68989..47abade8 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -2746,7 +2746,7 @@ public class MjonPayController { // 검색 데이터가 없거나 // 시작일자가 종료일자보다 이후이거나 // 총 기간이 365일이 넘으면 현재일부터 365일 전 날짜를 넣어서 검색 - if(!DateUtil.dateChk365AndValueChk(mjonMsgVO.getStartDate(),mjonMsgVO.getEndDate() )) { + if(!DateUtil.dateChkAndValueChk(mjonMsgVO.getStartDate(),mjonMsgVO.getEndDate(), 365 )) { mjonMsgVO.setStartDate(DateUtil.getDateDaysAgo(365)); mjonMsgVO.setEndDate(DateUtil.getCurrentDate()); diff --git a/src/main/webapp/publish/js/cmnDateAndChk.js b/src/main/webapp/publish/js/cmnDateAndChk.js index cb544b8f..054dc4e9 100644 --- a/src/main/webapp/publish/js/cmnDateAndChk.js +++ b/src/main/webapp/publish/js/cmnDateAndChk.js @@ -28,7 +28,13 @@ function fn_cmndataValueChk(startId, endId, chkDay){ var diffTime = Math.abs(end - start); var diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24)); if (diffDays > chkDay) { - alert("총 검색 기간은 "+chkDay+"일을 넘을 수 없습니다."); + + var chkDayTxt = ""; + if(chkDay == 365){ + chkDayTxt = '1년'; + } + + alert("총 검색 기간은 "+chkDayTxt+"을 넘을 수 없습니다."); return false; }