lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-05-10 07:38:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add 添加跨月比较是否在同一周

Browse Source
This commit is contained in:
naooohu 2022-01-20 21:12:29 +08:00
parent 538874562d
commit 7d4d87be82
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hutool-core/src/main/java/cn/hutool/core/date/CalendarUtil.java
View File

@ -359,9 +359,7 @@ public class CalendarUtil {
if (cal1 == null || cal2 == null) { if (cal1 == null || cal2 == null) {
throw new IllegalArgumentException("The date must not be null"); throw new IllegalArgumentException("The date must not be null");
} }
return cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) && return isSameDay(cal1, cal2);
cal1.get(Calendar.MONTH) == cal2.get(Calendar.MONTH) &&
cal1.get(Calendar.DAY_OF_WEEK) == cal2.get(Calendar.DAY_OF_WEEK);
} }
/** /**

6
hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java
View File

@ -1006,13 +1006,15 @@ public class DateUtilTest {
} }
@Test @Test
public void test() { public void isSameWeektest() {
// 周六与周日比较 // 周六与周日比较
final boolean isSameWeek = DateUtil.isSameWeek(DateTime.of("2022-01-01", "yyyy-MM-dd"), DateTime.of("2022-01-02", "yyyy-MM-dd"), true); final boolean isSameWeek = DateUtil.isSameWeek(DateTime.of("2022-01-01", "yyyy-MM-dd"), DateTime.of("2022-01-02", "yyyy-MM-dd"), true);
Assert.assertTrue(isSameWeek); Assert.assertTrue(isSameWeek);
// 周日与周一比较 // 周日与周一比较
final boolean isSameWeek1 = DateUtil.isSameWeek(DateTime.of("2022-01-02", "yyyy-MM-dd"), DateTime.of("2022-01-03", "yyyy-MM-dd"), false); final boolean isSameWeek1 = DateUtil.isSameWeek(DateTime.of("2022-01-02", "yyyy-MM-dd"), DateTime.of("2022-01-03", "yyyy-MM-dd"), false);
Assert.assertTrue(isSameWeek1); Assert.assertTrue(isSameWeek1);
// 跨月比较
final boolean isSameWeek2 = DateUtil.isSameWeek(DateTime.of("2021-12-29", "yyyy-MM-dd"), DateTime.of("2022-01-01", "yyyy-MM-dd"), true);
Assert.assertTrue(isSameWeek2);
} }
} }