From 891a0a7c52c25a31f318b7ff256aa45f0600512a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 09 八月 2024 17:37:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/utils/DateUtils.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/utils/DateUtils.java b/ycl-server/src/main/java/com/ycl/utils/DateUtils.java
index a27708e..9988e85 100644
--- a/ycl-server/src/main/java/com/ycl/utils/DateUtils.java
+++ b/ycl-server/src/main/java/com/ycl/utils/DateUtils.java
@@ -230,6 +230,26 @@
     }
 
     /**
+     * 鑾峰彇鏌愭湀寮�濮嬫棩鏈�
+     */
+    public static String getMouthStart(@Nullable Date date) {
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar c = Calendar.getInstance();
+        c.add(Calendar.MONTH, 0);
+        c.set(Calendar.DAY_OF_MONTH,1);
+        return df.format(c.getTime());
+    }
+
+    /**
+     * 鑾峰彇鏌愭湀缁撴潫鏃ユ湡
+     */
+    public static String getMouthEnd(@Nullable Date date) {
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar c = Calendar.getInstance();
+        c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
+        return df.format(c.getTime());
+    }
+    /**
      * 鑾峰彇鎸囧畾Calendar鐨勫搴﹀紑濮嬫棩鏈�
       * @param calendar 鏃ュ巻
      * @return 瀛e害绗竴澶�

--
Gitblit v1.8.0