--- src/main/java/itn/com/cmm/util/DateUtil.java
+++ src/main/java/itn/com/cmm/util/DateUtils.java
... | ... | @@ -3,8 +3,6 @@ |
| 3 | 3 |
import java.text.ParseException; |
| 4 | 4 |
import java.text.SimpleDateFormat; |
| 5 | 5 |
import java.time.LocalDate; |
| 6 |
-import java.time.LocalDateTime; |
|
| 7 |
-import java.time.Month; |
|
| 8 | 6 |
import java.time.format.DateTimeFormatter; |
| 9 | 7 |
import java.time.temporal.ChronoUnit; |
| 10 | 8 |
import java.util.Date; |
... | ... | @@ -23,9 +21,9 @@ |
| 23 | 21 |
* |
| 24 | 22 |
* |
| 25 | 23 |
*/ |
| 26 |
-public final class DateUtil {
|
|
| 24 |
+public final class DateUtils {
|
|
| 27 | 25 |
|
| 28 |
- // 날짜를 포맷하는 포맷터 정의 |
|
| 26 |
+ // 날짜를 포맷하는 기본 포맷터 정의 |
|
| 29 | 27 |
private static final DateTimeFormatter SLUSH_FORMATTER = DateTimeFormatter.ofPattern("yyyy/MM/dd");
|
| 30 | 28 |
|
| 31 | 29 |
/** |
--- src/main/java/itn/let/fax/admin/service/impl/FaxAdmServiceImpl.java
+++ src/main/java/itn/let/fax/admin/service/impl/FaxAdmServiceImpl.java
... | ... | @@ -20,7 +20,7 @@ |
| 20 | 20 |
import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; |
| 21 | 21 |
import egovframework.rte.fdl.idgnr.EgovIdGnrService; |
| 22 | 22 |
import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; |
| 23 |
-import itn.com.cmm.util.DateUtil; |
|
| 23 |
+import itn.com.cmm.util.DateUtils; |
|
| 24 | 24 |
import itn.com.utl.fcc.service.EgovDateUtil; |
| 25 | 25 |
import itn.let.fax.admin.service.FaxAdmService; |
| 26 | 26 |
import itn.let.fax.admin.service.FaxStatVO; |
... | ... | @@ -195,8 +195,8 @@ |
| 195 | 195 |
String date = simpleDateFormat.format(new Date()); |
| 196 | 196 |
if("".equals(faxGroupDataVO.getSearchDateType()) || faxGroupDataVO.getSearchDateType() == null) {
|
| 197 | 197 |
faxGroupDataVO.setSearchDateType("month");
|
| 198 |
- faxGroupDataVO.setSearchYear(DateUtil.getNowYearToString()); |
|
| 199 |
- faxGroupDataVO.setSearchMonth(DateUtil.getNowMonthToString()); |
|
| 198 |
+ faxGroupDataVO.setSearchYear(DateUtils.getNowYearToString()); |
|
| 199 |
+ faxGroupDataVO.setSearchMonth(DateUtils.getNowMonthToString()); |
|
| 200 | 200 |
} |
| 201 | 201 |
|
| 202 | 202 |
List<FaxGroupDataVO> faxGroupListVO = faxDao.selectFaxStatList(faxGroupDataVO); |
--- src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java
+++ src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java
... | ... | @@ -30,7 +30,7 @@ |
| 30 | 30 |
import egovframework.rte.fdl.cmmn.exception.FdlException; |
| 31 | 31 |
import egovframework.rte.fdl.idgnr.EgovIdGnrService; |
| 32 | 32 |
import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; |
| 33 |
-import itn.com.cmm.util.DateUtil; |
|
| 33 |
+import itn.com.cmm.util.DateUtils; |
|
| 34 | 34 |
import itn.com.cmm.util.FaxUtil; |
| 35 | 35 |
import itn.let.fax.user.service.FaxConvertMngVO; |
| 36 | 36 |
import itn.let.fax.user.service.FaxConvertVO; |
... | ... | @@ -240,8 +240,8 @@ |
| 240 | 240 |
if(StringUtils.isEmpty(faxGroupDataVO.getSearchStartDate()) |
| 241 | 241 |
&& StringUtils.isEmpty(faxGroupDataVO.getSearchEndDate()) |
| 242 | 242 |
) {
|
| 243 |
- faxGroupDataVO.setSearchStartDate(DateUtil.getTodayYearAndMonthAndFirstDay()); |
|
| 244 |
- faxGroupDataVO.setSearchEndDate(DateUtil.getTodayYearAndMonthAndLastDay()); |
|
| 243 |
+ faxGroupDataVO.setSearchStartDate(DateUtils.getTodayYearAndMonthAndFirstDay()); |
|
| 244 |
+ faxGroupDataVO.setSearchEndDate(DateUtils.getTodayYearAndMonthAndLastDay()); |
|
| 245 | 245 |
} |
| 246 | 246 |
|
| 247 | 247 |
/** pageing */ |
... | ... | @@ -287,9 +287,9 @@ |
| 287 | 287 |
Map<String, Object> dateMap = new HashMap<String, Object>(); |
| 288 | 288 |
|
| 289 | 289 |
|
| 290 |
- dateMap.put("year", DateUtil.getNowYearToString());
|
|
| 291 |
- dateMap.put("month", DateUtil.getNowMonthToString());
|
|
| 292 |
- dateMap.put("day", DateUtil.getNowDayToString());
|
|
| 290 |
+ dateMap.put("year", DateUtils.getNowYearToString());
|
|
| 291 |
+ dateMap.put("month", DateUtils.getNowMonthToString());
|
|
| 292 |
+ dateMap.put("day", DateUtils.getNowDayToString());
|
|
| 293 | 293 |
resultMap.put("dateMap", dateMap);
|
| 294 | 294 |
|
| 295 | 295 |
return resultMap; |
... | ... | @@ -606,7 +606,7 @@ |
| 606 | 606 |
&& StringUtils.isEmpty(faxGroupDataVO.getSearchEndDate()) |
| 607 | 607 |
) {
|
| 608 | 608 |
// faxGroupDataVO.setSearchStartDate(DateUtil.getTodayYearAndMonthAndFirstDay()); |
| 609 |
- faxGroupDataVO.setSearchEndDate(DateUtil.getTodayYearAndMonthAndLastDay()); |
|
| 609 |
+ faxGroupDataVO.setSearchEndDate(DateUtils.getTodayYearAndMonthAndLastDay()); |
|
| 610 | 610 |
} |
| 611 | 611 |
|
| 612 | 612 |
/** pageing */ |
--- src/main/java/itn/let/mjo/msgCustom/web/MjonMsgCustomWebController.java
+++ src/main/java/itn/let/mjo/msgCustom/web/MjonMsgCustomWebController.java
... | ... | @@ -35,7 +35,7 @@ |
| 35 | 35 |
import itn.com.cmm.service.EgovFileMngService; |
| 36 | 36 |
import itn.com.cmm.service.EgovFileMngUtil; |
| 37 | 37 |
import itn.com.cmm.service.FileVO; |
| 38 |
-import itn.com.cmm.util.DateUtil; |
|
| 38 |
+import itn.com.cmm.util.DateUtils; |
|
| 39 | 39 |
import itn.com.utl.fcc.service.EgovStringUtil; |
| 40 | 40 |
import itn.let.lett.service.HashConfVO; |
| 41 | 41 |
import itn.let.lett.service.LetterService; |
... | ... | @@ -145,8 +145,8 @@ |
| 145 | 145 |
// 내 보관함 - 기본 날짜 검색 셋팅 |
| 146 | 146 |
// 오늘 날짜에서 365일 날짜 가져와서 |
| 147 | 147 |
// 검색날짜에 입력 |
| 148 |
- model.addAttribute("myStartDate", DateUtil.getDateDaysAgo(365));
|
|
| 149 |
- model.addAttribute("myEndDate", DateUtil.getCurrentDate());
|
|
| 148 |
+ model.addAttribute("myStartDate", DateUtils.getDateDaysAgo(365));
|
|
| 149 |
+ model.addAttribute("myEndDate", DateUtils.getCurrentDate());
|
|
| 150 | 150 |
|
| 151 | 151 |
|
| 152 | 152 |
|
... | ... | @@ -229,10 +229,10 @@ |
| 229 | 229 |
// 검색 데이터가 없거나 |
| 230 | 230 |
// 시작일자가 종료일자보다 이후이거나 |
| 231 | 231 |
// 총 기간이 365일이 넘으면 현재일부터 365일 전 날짜를 넣어서 검색 |
| 232 |
- if(!DateUtil.dateChkAndValueChk(mjonMsgCustomVO.getSearchStartDate(),mjonMsgCustomVO.getSearchEndDate(), 365 )) {
|
|
| 232 |
+ if(!DateUtils.dateChkAndValueChk(mjonMsgCustomVO.getSearchStartDate(),mjonMsgCustomVO.getSearchEndDate(), 365 )) {
|
|
| 233 | 233 |
|
| 234 |
- mjonMsgCustomVO.setSearchStartDate(DateUtil.getDateDaysAgo(365)); |
|
| 235 |
- mjonMsgCustomVO.setSearchEndDate(DateUtil.getCurrentDate()); |
|
| 234 |
+ mjonMsgCustomVO.setSearchStartDate(DateUtils.getDateDaysAgo(365)); |
|
| 235 |
+ mjonMsgCustomVO.setSearchEndDate(DateUtils.getCurrentDate()); |
|
| 236 | 236 |
|
| 237 | 237 |
}; |
| 238 | 238 |
|
--- src/main/java/itn/let/mjo/pay/web/MjonPayController.java
+++ src/main/java/itn/let/mjo/pay/web/MjonPayController.java
... | ... | @@ -61,7 +61,7 @@ |
| 61 | 61 |
import itn.com.cmm.LoginVO; |
| 62 | 62 |
import itn.com.cmm.service.EgovCmmUseService; |
| 63 | 63 |
import itn.com.cmm.service.FileVO; |
| 64 |
-import itn.com.cmm.util.DateUtil; |
|
| 64 |
+import itn.com.cmm.util.DateUtils; |
|
| 65 | 65 |
import itn.com.cmm.util.MJUtil; |
| 66 | 66 |
import itn.com.cmm.util.RedirectUrlMaker; |
| 67 | 67 |
import itn.com.cmm.util.StringUtil; |
... | ... | @@ -2018,8 +2018,8 @@ |
| 2018 | 2018 |
|
| 2019 | 2019 |
{
|
| 2020 | 2020 |
// 초기 날짜 셋팅 |
| 2021 |
- model.addAttribute("startDate", DateUtil.getDateDaysAgo(365));
|
|
| 2022 |
- model.addAttribute("endDate", DateUtil.getCurrentDate());
|
|
| 2021 |
+ model.addAttribute("startDate", DateUtils.getDateDaysAgo(365));
|
|
| 2022 |
+ model.addAttribute("endDate", DateUtils.getCurrentDate());
|
|
| 2023 | 2023 |
} |
| 2024 | 2024 |
|
| 2025 | 2025 |
|
... | ... | @@ -2108,9 +2108,9 @@ |
| 2108 | 2108 |
// mjonPayVO.setStartDate(mjonPayVO.getStartDate() == null ? DateUtil.getDateDaysAgo(365) : mjonPayVO.getStartDate()); |
| 2109 | 2109 |
// mjonPayVO.setEndDate(mjonPayVO.getEndDate() == null ? DateUtil.getCurrentDate() : mjonPayVO.getEndDate()); |
| 2110 | 2110 |
|
| 2111 |
- if(!DateUtil.dateChkAndValueChk(mjonPayVO.getSearchStartDate(),mjonPayVO.getSearchEndDate(), 365 )) {
|
|
| 2112 |
- mjonPayVO.setStartDate(DateUtil.getDateDaysAgo(365)); |
|
| 2113 |
- mjonPayVO.setEndDate(DateUtil.getCurrentDate()); |
|
| 2111 |
+ if(!DateUtils.dateChkAndValueChk(mjonPayVO.getSearchStartDate(),mjonPayVO.getSearchEndDate(), 365 )) {
|
|
| 2112 |
+ mjonPayVO.setStartDate(DateUtils.getDateDaysAgo(365)); |
|
| 2113 |
+ mjonPayVO.setEndDate(DateUtils.getCurrentDate()); |
|
| 2114 | 2114 |
}; |
| 2115 | 2115 |
|
| 2116 | 2116 |
|
... | ... | @@ -2713,8 +2713,8 @@ |
| 2713 | 2713 |
} |
| 2714 | 2714 |
{
|
| 2715 | 2715 |
// 초기 날짜 셋팅 |
| 2716 |
- model.addAttribute("startDate", DateUtil.getDateDaysAgo(365));
|
|
| 2717 |
- model.addAttribute("endDate", DateUtil.getCurrentDate());
|
|
| 2716 |
+ model.addAttribute("startDate", DateUtils.getDateDaysAgo(365));
|
|
| 2717 |
+ model.addAttribute("endDate", DateUtils.getCurrentDate());
|
|
| 2718 | 2718 |
} |
| 2719 | 2719 |
|
| 2720 | 2720 |
return "/web/pay/PayUserSWList"; |
... | ... | @@ -2762,10 +2762,10 @@ |
| 2762 | 2762 |
// 검색 데이터가 없거나 |
| 2763 | 2763 |
// 시작일자가 종료일자보다 이후이거나 |
| 2764 | 2764 |
// 총 기간이 365일이 넘으면 현재일부터 365일 전 날짜를 넣어서 검색 |
| 2765 |
- if(!DateUtil.dateChkAndValueChk(mjonMsgVO.getStartDate(),mjonMsgVO.getEndDate(), 365 )) {
|
|
| 2765 |
+ if(!DateUtils.dateChkAndValueChk(mjonMsgVO.getStartDate(),mjonMsgVO.getEndDate(), 365 )) {
|
|
| 2766 | 2766 |
|
| 2767 |
- mjonMsgVO.setStartDate(DateUtil.getDateDaysAgo(365)); |
|
| 2768 |
- mjonMsgVO.setEndDate(DateUtil.getCurrentDate()); |
|
| 2767 |
+ mjonMsgVO.setStartDate(DateUtils.getDateDaysAgo(365)); |
|
| 2768 |
+ mjonMsgVO.setEndDate(DateUtils.getCurrentDate()); |
|
| 2769 | 2769 |
|
| 2770 | 2770 |
}; |
| 2771 | 2771 |
|
--- src/main/java/itn/let/uat/uia/web/EgovMypageRESTAPIController.java
+++ src/main/java/itn/let/uat/uia/web/EgovMypageRESTAPIController.java
... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 |
|
| 17 | 17 |
import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; |
| 18 | 18 |
import itn.com.cmm.LoginVO; |
| 19 |
-import itn.com.cmm.util.DateUtil; |
|
| 19 |
+import itn.com.cmm.util.DateUtils; |
|
| 20 | 20 |
import itn.com.utl.fcc.service.EgovStringUtil; |
| 21 | 21 |
import itn.let.mjo.apikey.service.ApiCallInfoMngService; |
| 22 | 22 |
import itn.let.mjo.apikey.service.ApiKeyMngService; |
... | ... | @@ -202,8 +202,8 @@ |
| 202 | 202 |
if (resultList.size()>0) {
|
| 203 | 203 |
if(StringUtils.isNotEmpty(resultList.get(0).getFrstRegistPnttm())) |
| 204 | 204 |
{
|
| 205 |
- resultList.get(0).setFrstRegistPnttm(DateUtil.getChangFormatS(resultList.get(0).getFrstRegistPnttm())); |
|
| 206 |
- resultList.get(0).setLastUpdtPnttm(DateUtil.getChangFormatS(resultList.get(0).getLastUpdtPnttm())); |
|
| 205 |
+ resultList.get(0).setFrstRegistPnttm(DateUtils.getChangFormatS(resultList.get(0).getFrstRegistPnttm())); |
|
| 206 |
+ resultList.get(0).setLastUpdtPnttm(DateUtils.getChangFormatS(resultList.get(0).getLastUpdtPnttm())); |
|
| 207 | 207 |
} |
| 208 | 208 |
|
| 209 | 209 |
model.addAttribute("apiVO", resultList.get(0));
|
... | ... | @@ -216,7 +216,7 @@ |
| 216 | 216 |
System.out.println("!!!!!!!!!!!!!!!!!");
|
| 217 | 217 |
resultList_call.forEach(t-> {
|
| 218 | 218 |
try {
|
| 219 |
- t.setFrstRegistPnttm(DateUtil.getChangFormatS(t.getFrstRegistPnttm())); |
|
| 219 |
+ t.setFrstRegistPnttm(DateUtils.getChangFormatS(t.getFrstRegistPnttm())); |
|
| 220 | 220 |
} catch (ParseException e) {
|
| 221 | 221 |
// TODO Auto-generated catch block |
| 222 | 222 |
e.printStackTrace(); |
--- src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java
+++ src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java
... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 |
import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; |
| 17 | 17 |
import egovframework.rte.fdl.idgnr.EgovIdGnrService; |
| 18 | 18 |
import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; |
| 19 |
-import itn.com.cmm.util.DateUtil; |
|
| 19 |
+import itn.com.cmm.util.DateUtils; |
|
| 20 | 20 |
import itn.let.fax.user.service.FaxGroupDataVO; |
| 21 | 21 |
import itn.let.fax.user.service.impl.FaxDAO; |
| 22 | 22 |
import itn.let.mjo.mjocommon.MjonCommon; |
... | ... | @@ -860,8 +860,8 @@ |
| 860 | 860 |
if(StringUtils.isEmpty(faxGroupDataVO.getSearchStartDate()) |
| 861 | 861 |
&& StringUtils.isEmpty(faxGroupDataVO.getSearchEndDate()) |
| 862 | 862 |
) {
|
| 863 |
- faxGroupDataVO.setSearchStartDate(DateUtil.getTodayYearAndMonthAndFirstDay()); |
|
| 864 |
- faxGroupDataVO.setSearchEndDate(DateUtil.getTodayYearAndMonthAndLastDay()); |
|
| 863 |
+ faxGroupDataVO.setSearchStartDate(DateUtils.getTodayYearAndMonthAndFirstDay()); |
|
| 864 |
+ faxGroupDataVO.setSearchEndDate(DateUtils.getTodayYearAndMonthAndLastDay()); |
|
| 865 | 865 |
} |
| 866 | 866 |
|
| 867 | 867 |
/** pageing */ |
--- src/main/webapp/WEB-INF/jsp/layout/include/defaultResource.jsp
+++ src/main/webapp/WEB-INF/jsp/layout/include/defaultResource.jsp
... | ... | @@ -42,7 +42,7 @@ |
| 42 | 42 |
<!-- |
| 43 | 43 |
20240704 이호영 추가 /cmnDateAndChk.js |
| 44 | 44 |
--> |
| 45 |
- <script type="text/javascript" src="/publish/js/cmnDateAndChk.js"></script> |
|
| 45 |
+ <script type="text/javascript" src="/publish/js/dateUtils.js"></script> |
|
| 46 | 46 |
<script type="text/javascript" src="/publish/js/content.js?date=202211070003"></script> |
| 47 | 47 |
<script type="text/javascript" src="/publish/js/popupLayer.js"></script> |
| 48 | 48 |
<script type="text/javascript" src="/publish/js/popup.js"></script> |
--- src/main/webapp/publish/js/cmnDateAndChk.js
+++ src/main/webapp/publish/js/dateUtils.js
| No changes |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?