From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index cc3026f..7f2fc50 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -1733,11 +1733,22 @@
}
public static Date getFirstThisYearDate() {
try {
- return sdfShort.parse( getNowShortDate().substring(0, 4) + "0101");
+ return sdfLong.parse( getNowShortDate().substring(0, 4) + "-01-01");
} catch (Exception e) {
return null;
}
}
+
+ public static Date getFirstThisMonthDate() {
+ try {
+ return sdfLong.parse( getNowFormateDate().substring(0, 7) + "-01");
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+
+
public static String getFirstDayCurrentMonth() {
try {
return getDateLong(new Date()).substring(0, 7) + "-01";
@@ -2490,6 +2501,16 @@
return null;
}
}
+ public static Date getDateFromShortString(String strDate) {
+ if (StringUtils.isEmpty(strDate)) {
+ return null;
+ }
+ try {
+ return sdfLong.parse(strDate);
+ } catch (Exception ex) {
+ return null;
+ }
+ }
// -----------------------------------------------------------------------
@@ -2931,8 +2952,9 @@
// Date date1 = getISO8601DateByStr("2024-06-14T08:46:36.014+08:00");
// System.out.println(DateUtil.afterMinutesDate(-5));
+ System.out.println(DateUtil.getFirstThisMonthDate());
- System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
+// System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
// System.out.println(DateUtil.getBeforMonthStr(new Date(),12));
// List<Date> list =getThisMonthDateList();
@@ -3098,6 +3120,25 @@
}
/**
+ * 鑾峰彇褰撳墠鏃ユ湡鏄槦鏈熷嚑<br>
+ *
+ * @param dt
+ * @return 褰撳墠鏃ユ湡鏄槦鏈熷嚑
+ */
+ public static String getWeekZhouOfDate(Date dt) {
+ String[] weekDays = { "鍛ㄦ棩", "鍛ㄤ竴", "鍛ㄤ簩", "鍛ㄤ笁", "鍛ㄥ洓", "鍛ㄤ簲", "鍛ㄥ叚" };
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(dt);
+
+ int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
+ if (w < 0)
+ {
+ w = 0;
+ }
+
+ return weekDays[w];
+ }
+ /**
* 鑾峰彇鏄熸湡鏁�
*
* @param dt
--
Gitblit v1.9.3