From 4ec71930da15cc83b2fbf67fdeade89b8900b14c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 31 三月 2026 17:32:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/common/utils/DateUtils.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/DateUtils.java b/src/main/java/com/ruoyi/common/utils/DateUtils.java
index 0fa7e5a..cab055a 100644
--- a/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -197,4 +197,23 @@
ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
return Date.from(zdt.toInstant());
}
+
+ /**
+ * 鏃ユ湡鏍煎紡鍖�
+ */
+ public static String normalizePattern(String pattern) {
+ if (StringUtils.isEmpty(pattern)) return "yyyy-MM-dd";
+ return pattern.replace("YYYY", "yyyy")
+ .replace("DD", "dd")
+ .replace("SS", "ss");
+ }
+
+ /**
+ * 杞崲涓哄叏澶у啓鏄剧ず
+ */
+ public static String toUpperCasePattern(String pattern) {
+ if (StringUtils.isEmpty(pattern)) return "";
+ return pattern.replace("yyyy", "YYYY")
+ .replace("dd", "DD");
+ }
}
--
Gitblit v1.9.3