From 55ba702c1df240929e68df3b42fa9cb0607378b8 Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期一, 08 九月 2025 10:58:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1 --- server/services/src/main/java/com/doumee/core/utils/DateUtil.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java index ca3082d..f585aa6 100644 --- a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java +++ b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java @@ -69,6 +69,30 @@ } + public static List<Date> getDateList(Date dBegin, Date dEnd) { + int i = 1; + //鏃ユ湡宸ュ叿绫诲噯澶� + DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + //璁剧疆寮�濮嬫椂闂� + Calendar calBegin = Calendar.getInstance(); + calBegin.setTime(dBegin); + int weekNumber = calBegin.get(Calendar.DAY_OF_WEEK) - 1; + //璁剧疆缁撴潫鏃堕棿 + Calendar calEnd = Calendar.getInstance(); + calEnd.setTime(dEnd); + //瑁呰繑鍥炵殑鏃ユ湡闆嗗悎瀹瑰櫒 + List<Date> dateList = new ArrayList<Date>(); + dateList.add(dBegin); + //灏嗙涓�涓湀娣诲姞閲岄潰鍘� + while (dEnd.after(calBegin.getTime())) { + calBegin.add(Calendar.DAY_OF_MONTH, 1); + Date date = calBegin.getTime(); + dateList.add(date); + } + return dateList; + } + + public static Date StringToDateFormat(String DATE,String format) { if(StringUtils.isBlank(DATE)){ -- Gitblit v1.9.3