From 83f18e10afcf40a9e7115d4367c308297ccbf832 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 18:27:31 +0800
Subject: [PATCH] 优化代码

---
 java110-utils/src/main/java/com/java110/utils/util/DateUtil.java |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
index acf070f..321d06a 100755
--- a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
@@ -36,7 +36,6 @@
     public static final String DATE_FORMATE_STRING_Q = "yyyy-MM";
 
 
-
     static {
         formats.put("yyyyMMddHHmmss", new SimpleDateFormat("yyyyMMddHHmmss"));
         formats.put("yyyy-MM-dd HH:mm:ss", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
@@ -416,6 +415,27 @@
         return curDate;
     }
 
+    public static Date getFirstDate(Date curDate) {
+        Calendar curDateCal = Calendar.getInstance();
+        curDateCal.setTime(curDate);
+        curDateCal.set(Calendar.DAY_OF_MONTH, 1);
+        curDateCal.set(Calendar.HOUR_OF_DAY, 0);
+        curDateCal.set(Calendar.MINUTE, 0);
+        curDateCal.set(Calendar.SECOND, 0);
+        return curDateCal.getTime();
+    }
+
+    public static Date getFirstDate(String curDate) {
+        Date date = DateUtil.getDateFromStringB(curDate);
+        Calendar curDateCal = Calendar.getInstance();
+        curDateCal.setTime(date);
+        curDateCal.set(Calendar.DAY_OF_MONTH, 1);
+        curDateCal.set(Calendar.HOUR_OF_DAY, 0);
+        curDateCal.set(Calendar.MINUTE, 0);
+        curDateCal.set(Calendar.SECOND, 0);
+        return curDateCal.getTime();
+    }
+
 
     public static String getNextMonthFirstDay(String fmt) {
         String returndate = "";
@@ -758,11 +778,12 @@
 
     /**
      * 闄ゅ幓 灏忔椂 鍒� 绉�
+     *
      * @param time
      * @return
      */
-    public static Date timeToDate(Date time){
-        Calendar calendar =Calendar.getInstance();
+    public static Date timeToDate(Date time) {
+        Calendar calendar = Calendar.getInstance();
         calendar.setTime(time);
         setTimeToMidnight(calendar);
         return calendar.getTime();

--
Gitblit v1.8.0