From 6e006cb835fce4720139de0cc2ec3be734295ed9 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 12 七月 2025 14:18:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java
index de64074..b6dc8c5 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java
@@ -1099,8 +1099,8 @@
// 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛�
LocalDate firstDayOfWeek = localDate.with(DayOfWeek.MONDAY);
- // 杞崲鍥� java.sql.Date 绫诲瀷
- return java.sql.Date.valueOf(firstDayOfWeek);
+ // 杞崲鍥� Date 绫诲瀷
+ return Date.from(firstDayOfWeek.atStartOfDay(ZoneId.systemDefault()).toInstant());
}
/**
@@ -1116,8 +1116,8 @@
// 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛�
LocalDate firstDayOfWeek = localDate.with(DayOfWeek.MONDAY);
- // 杞崲鍥� java.sql.Date 绫诲瀷
- return java.sql.Date.valueOf(firstDayOfWeek);
+ // 杞崲鍥� Date 绫诲瀷
+ return Date.from(firstDayOfWeek.atStartOfDay(ZoneId.systemDefault()).toInstant());
}
/**
@@ -1128,11 +1128,11 @@
// 灏� java.util.Date 杞崲涓� LocalDate
LocalDate localDate = LocalDate.parse(date);
- // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛�
- LocalDate firstDayOfWeek = localDate.with(DayOfWeek.SUNDAY);
+ // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄦ棩锛�
+ LocalDate lastDayOfWeek = localDate.with(DayOfWeek.SUNDAY);
- // 杞崲鍥� java.sql.Date 绫诲瀷
- return java.sql.Date.valueOf(firstDayOfWeek);
+ // 杞崲鍥� Date 绫诲瀷
+ return Date.from(lastDayOfWeek.atStartOfDay(ZoneId.systemDefault()).toInstant());
}
/**
@@ -1144,10 +1144,21 @@
LocalDate localDate = date.toInstant()
.atZone(ZoneId.systemDefault())
.toLocalDate();
- // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛�
- LocalDate firstDayOfWeek = localDate.with(DayOfWeek.SUNDAY);
+ // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄦ棩锛�
+ LocalDate lastDayOfWeek = localDate.with(DayOfWeek.SUNDAY);
- // 杞崲鍥� java.sql.Date 绫诲瀷
- return java.sql.Date.valueOf(firstDayOfWeek);
+ // 杞崲鍥� Date 绫诲瀷
+ return Date.from(lastDayOfWeek.atStartOfDay(ZoneId.systemDefault()).toInstant());
+ }
+
+ public static boolean isSameDay(Date date1, Date date2) {
+ if (date1 == null || date2 == null) {
+ return false;
+ }
+
+ LocalDate localDate1 = date1.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+ LocalDate localDate2 = date2.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+
+ return localDate1.equals(localDate2);
}
}
--
Gitblit v1.9.3