From 7aac89af7c8b8a633cb0a0c870e81724b0ec5def Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期五, 03 二月 2023 10:54:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/hx/util/DateUtil.java | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/hx/util/DateUtil.java b/src/main/java/com/hx/util/DateUtil.java index 64e037f..ddefebf 100644 --- a/src/main/java/com/hx/util/DateUtil.java +++ b/src/main/java/com/hx/util/DateUtil.java @@ -455,7 +455,7 @@ * endTime姣攕tartTime澶氱殑澶╂暟 * @param startTime 鏈�灏忔椂闂� * @param endTime 鏈�澶ф椂闂� - * @return + * @return 杩斿洖 */ public static Integer differDay(Date startTime,Date endTime){ Calendar cal1 = Calendar.getInstance(); @@ -500,8 +500,7 @@ } /**鎶婄杞崲鎴怷澶鏃禭鍒哫绉�*/ - public static String getChineseStr(Integer second) - { + public static String getChineseStr(Integer second) { int day = 24 * 60 * 60; int hour = 60 * 60; int min = 60; @@ -609,7 +608,7 @@ public static Date getYearStart(Date time) { Calendar calendar = Calendar.getInstance(); calendar.setTime(time); - calendar.set(Calendar.MONTH, 1); + calendar.set(Calendar.MONTH, 0); calendar.set(Calendar.DAY_OF_MONTH, 1); calendar.set(Calendar.HOUR_OF_DAY, 0); calendar.set(Calendar.MINUTE, 0); @@ -625,7 +624,7 @@ public static Date getYearEnd(Date time) { Calendar calendar = Calendar.getInstance(); calendar.setTime(time); - calendar.set(Calendar.MONTH, 12); + calendar.set(Calendar.MONTH, 11); calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DATE)); calendar.set(Calendar.HOUR_OF_DAY, 23); calendar.set(Calendar.MINUTE, 59); @@ -695,6 +694,7 @@ cal.roll(Calendar.DATE, -1); return cal.getActualMaximum(Calendar.DATE); } + /**鑾峰彇鏈堜唤鐨勫ぉ鏁� * @param year 骞翠唤 * @param month 鏈堜唤 @@ -712,7 +712,7 @@ /**鑾峰彇鏈堜唤鐨勫ぉ鏁� * @param yearMonth 骞存湀 * @param format 鏃堕棿鏍煎紡 - * @return + * @return 杩斿洖 */ public static int getMonthDays(String yearMonth,String format) { SimpleDateFormat sdf = new SimpleDateFormat(format); @@ -766,4 +766,18 @@ month.roll(Calendar.DATE, -1); return month.getActualMaximum(Calendar.DATE) - Calendar.getInstance().get(Calendar.DAY_OF_MONTH); } + + /**鑾峰彇褰撳墠鏃堕棿鎵�鍦ㄥ懆鐨勫懆涓�00:00:00*/ + public static Date getMonday(Date date) { + Calendar calendar = Calendar.getInstance(Locale.CHINA); + calendar.setTime(date); + //浠ュ懆涓�涓洪鏃� + calendar.setFirstDayOfWeek(Calendar.MONDAY); + calendar.set(Calendar.HOUR_OF_DAY, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + //鍛ㄤ竴 + calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); + return calendar.getTime(); + } } -- Gitblit v1.8.0