From 0d12d0bcf91dfa30afaed20c58ef5819a4e61a84 Mon Sep 17 00:00:00 2001 From: KIM-HWI <79562205+kim-hwi@users.noreply.github.com> Date: Mon, 28 Aug 2023 18:32:29 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat=20=EC=BD=94=EB=93=9C=EB=A6=AC=ED=8C=A9?= =?UTF-8?q?=ED=86=A0=EB=A7=81=20->=20addCalender=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=EB=A5=BC=20=EC=83=9D=EC=84=B1=ED=95=98=EC=97=AC=20?= =?UTF-8?q?=EC=A4=91=EB=B3=B5=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rte/fdl/string/EgovDateUtil.java | 62 ++++++------------- 1 file changed, 18 insertions(+), 44 deletions(-) diff --git a/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovDateUtil.java b/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovDateUtil.java index cd74bf9d..b604ea2a 100644 --- a/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovDateUtil.java +++ b/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovDateUtil.java @@ -66,13 +66,7 @@ protected EgovDateUtil() { public static String getCalcDateAsString(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) { Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara)); - if (EgovStringUtil.equals(sGuBun, "day")) { - cd.add(Calendar.DATE, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "month")) { - cd.add(Calendar.MONTH, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "year")) { - cd.add(Calendar.YEAR, iTerm); - } + addCalender(iTerm, sGuBun, cd); return getFormalYear(cd) + getFormalMonth(cd) + getFormalDay(cd); } @@ -100,13 +94,7 @@ public static String getCalcYearAsString(String sYearPara, String sMonthPara, St Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara)); - if (EgovStringUtil.equals(sGuBun, "day")) { - cd.add(Calendar.DATE, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "month")) { - cd.add(Calendar.MONTH, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "year")) { - cd.add(Calendar.YEAR, iTerm); - } + addCalender(iTerm, sGuBun, cd); return getFormalYear(cd); } @@ -132,13 +120,7 @@ public static String getCalcYearAsString(String sYearPara, String sMonthPara, St public static String getCalcMonthAsString(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) { Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara)); - if (EgovStringUtil.equals(sGuBun, "day")) { - cd.add(Calendar.DATE, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "month")) { - cd.add(Calendar.MONTH, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "year")) { - cd.add(Calendar.YEAR, iTerm); - } + addCalender(iTerm, sGuBun, cd); return getFormalMonth(cd); } @@ -164,13 +146,7 @@ public static String getCalcMonthAsString(String sYearPara, String sMonthPara, S public static String getCalcDayAsString(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) { Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara)); - if (EgovStringUtil.equals(sGuBun, "day")) { - cd.add(Calendar.DATE, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "month")) { - cd.add(Calendar.MONTH, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "year")) { - cd.add(Calendar.YEAR, iTerm); - } + addCalender(iTerm, sGuBun, cd); return getFormalDay(cd); } @@ -196,13 +172,7 @@ public static String getCalcDayAsString(String sYearPara, String sMonthPara, Str public static int getCalcYearAsInt(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) { Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara)); - if (EgovStringUtil.equals(sGuBun, "day")) { - cd.add(Calendar.DATE, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "month")) { - cd.add(Calendar.MONTH, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "year")) { - cd.add(Calendar.YEAR, iTerm); - } + addCalender(iTerm, sGuBun, cd); return cd.get(Calendar.YEAR); } @@ -228,13 +198,7 @@ public static int getCalcYearAsInt(String sYearPara, String sMonthPara, String s public static int getCalcMonthAsInt(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) { Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara)); - if (EgovStringUtil.equals(sGuBun, "day")) { - cd.add(Calendar.DATE, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "month")) { - cd.add(Calendar.MONTH, iTerm); - } else if (EgovStringUtil.equals(sGuBun, "year")) { - cd.add(Calendar.YEAR, iTerm); - } + addCalender(iTerm, sGuBun, cd); return cd.get(Calendar.MONTH) + 1; } @@ -260,6 +224,18 @@ public static int getCalcMonthAsInt(String sYearPara, String sMonthPara, String public static int getCalcDayAsInt(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) { Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara)); + addCalender(iTerm, sGuBun, cd); + + return cd.get(Calendar.DAY_OF_MONTH); + } + + /** + * sGuBun의 종류에 따라 년/월/일 캘린더에 추가 + * @param iTerm + * @param sGuBun + * @param cd + */ + private static void addCalender(int iTerm, String sGuBun, Calendar cd) { if (EgovStringUtil.equals(sGuBun, "day")) { cd.add(Calendar.DATE, iTerm); } else if (EgovStringUtil.equals(sGuBun, "month")) { @@ -267,8 +243,6 @@ public static int getCalcDayAsInt(String sYearPara, String sMonthPara, String sD } else if (EgovStringUtil.equals(sGuBun, "year")) { cd.add(Calendar.YEAR, iTerm); } - - return cd.get(Calendar.DAY_OF_MONTH); } /** From dd8ac863f59362e2700dcef82bc5129d60cfa658 Mon Sep 17 00:00:00 2001 From: KIM-HWI <79562205+kim-hwi@users.noreply.github.com> Date: Thu, 31 Aug 2023 18:45:28 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=9D=B4=EC=8A=88=EC=97=B0=EA=B2=B0?= =?UTF-8?q?=EC=9A=A9=20=EC=BB=A4=EB=B0=8B=20#141?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/egovframe/rte/fdl/string/EgovDateUtil.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovDateUtil.java b/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovDateUtil.java index b604ea2a..82992798 100644 --- a/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovDateUtil.java +++ b/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovDateUtil.java @@ -818,5 +818,4 @@ public static String toString(Date date, String format, Locale locale) { String tmp = sdf.format(date); return tmp; } - }