diff --git a/bin/finalexam/StandardIO/DateFormatOutput.class b/bin/finalexam/StandardIO/DateFormatOutput.class index d29f13d..ab20d8b 100644 Binary files a/bin/finalexam/StandardIO/DateFormatOutput.class and b/bin/finalexam/StandardIO/DateFormatOutput.class differ diff --git a/src/finalexam/StandardIO/DateFormatOutput.java b/src/finalexam/StandardIO/DateFormatOutput.java index ca970fc..90231ab 100644 --- a/src/finalexam/StandardIO/DateFormatOutput.java +++ b/src/finalexam/StandardIO/DateFormatOutput.java @@ -20,14 +20,24 @@ public class DateFormatOutput { yearStr += "年"; if (month < 10) monthStr = num[month] + "月"; + else if (month == 10) + monthStr = "十月"; else monthStr = "十" + num[month % 10] + "月"; if (date < 10) dateStr = num[date] + "日"; + else if (date == 10) + dateStr = "十日"; else if (date < 20) dateStr = "十" + num[date % 10] + "日"; + else if (date == 20) + dateStr = "二十日"; + else if (date < 30) + dateStr = "二十" + num[date % 10] + "日"; + else if (date == 30) + dateStr = "三十日"; else - dateStr = num[date / 10] + "十" + num[date % 10] + "日"; + dateStr = "三十" + num[date % 10] + "日"; System.out.println(yearStr + monthStr + dateStr); } }