From 6a8e048ed345c93210a2a99989d060b4c7d464f0 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 08 七月 2025 15:21:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java | 63 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 14 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 efed637..de64074 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
@@ -1092,27 +1092,62 @@
* 鑾峰彇鏈懆鐨勭涓�澶╂棩鏈燂紝 鏍煎紡涓猴細yyyy-MM-dd
* @return
*/
- public static Date getFirstDayOfWeek() {
- // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛夌殑 LocalDate
- LocalDate today = LocalDate.now();
- LocalDate firstDayOfWeek = today.with(DayOfWeek.MONDAY);
+ public static Date getFirstDayOfWeek(String date) {
+ // 灏� java.util.Date 杞崲涓� LocalDate
+ LocalDate localDate = LocalDate.parse(date);
- // 濡傛灉闇�瑕佽浆鎹负浼犵粺鐨� Date 绫诲瀷锛堝彲閫夛級
- java.sql.Date sqlDate = java.sql.Date.valueOf(firstDayOfWeek);
- return new Date(sqlDate.getTime());
+ // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛�
+ LocalDate firstDayOfWeek = localDate.with(DayOfWeek.MONDAY);
+
+ // 杞崲鍥� java.sql.Date 绫诲瀷
+ return java.sql.Date.valueOf(firstDayOfWeek);
+ }
+
+ /**
+ * 鑾峰彇鏈懆鐨勭涓�澶╂棩鏈燂紝 鏍煎紡涓猴細yyyy-MM-dd
+ * @return
+ */
+ public static Date getFirstDayOfWeek(Date date) {
+ // 灏� java.util.Date 杞崲涓� LocalDate
+ LocalDate localDate = date.toInstant()
+ .atZone(ZoneId.systemDefault())
+ .toLocalDate();
+
+ // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛�
+ LocalDate firstDayOfWeek = localDate.with(DayOfWeek.MONDAY);
+
+ // 杞崲鍥� java.sql.Date 绫诲瀷
+ return java.sql.Date.valueOf(firstDayOfWeek);
}
/**
* 鑾峰彇鏈懆鐨勬渶鍚庝竴澶╂棩鏈燂紝 鏍煎紡涓猴細yyyy-MM-dd
* @return
*/
- public static Date getLastDayOfWeek() {
- // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛夌殑 LocalDate
- LocalDate today = LocalDate.now();
- LocalDate firstDayOfWeek = today.with(DayOfWeek.SUNDAY);
+ public static Date getLastDayOfWeek(String date) {
+ // 灏� java.util.Date 杞崲涓� LocalDate
+ LocalDate localDate = LocalDate.parse(date);
- // 濡傛灉闇�瑕佽浆鎹负浼犵粺鐨� Date 绫诲瀷锛堝彲閫夛級
- java.sql.Date sqlDate = java.sql.Date.valueOf(firstDayOfWeek);
- return new Date(sqlDate.getTime());
+ // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛�
+ LocalDate firstDayOfWeek = localDate.with(DayOfWeek.SUNDAY);
+
+ // 杞崲鍥� java.sql.Date 绫诲瀷
+ return java.sql.Date.valueOf(firstDayOfWeek);
+ }
+
+ /**
+ * 鑾峰彇鏈懆鐨勬渶鍚庝竴澶╂棩鏈燂紝 鏍煎紡涓猴細yyyy-MM-dd
+ * @return
+ */
+ public static Date getLastDayOfWeek(Date date) {
+ // 灏� java.util.Date 杞崲涓� LocalDate
+ LocalDate localDate = date.toInstant()
+ .atZone(ZoneId.systemDefault())
+ .toLocalDate();
+ // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛�
+ LocalDate firstDayOfWeek = localDate.with(DayOfWeek.SUNDAY);
+
+ // 杞崲鍥� java.sql.Date 绫诲瀷
+ return java.sql.Date.valueOf(firstDayOfWeek);
}
}
--
Gitblit v1.9.3