Browse Source

合并冲突

zhaoxian 1 year ago
parent
commit
6278742cb7
1 changed files with 20 additions and 0 deletions
  1. 20 0
      ruixuan-common/src/main/java/com/ruixuan/common/utils/DateUtils.java

+ 20 - 0
ruixuan-common/src/main/java/com/ruixuan/common/utils/DateUtils.java

@@ -428,6 +428,26 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         return format.format(c.getTime());
     }
 
+
+    public static String getLastMonthFirstDay() {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar c = Calendar.getInstance();
+        c.add(Calendar.MONTH, -1);
+        c.set(Calendar.DAY_OF_MONTH, 1);//设置为1号,当前日期既为本月第一天
+        return format.format(c.getTime());
+    }
+
+    public static String getLastMonthNowDay(String date) throws ParseException {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar c = Calendar.getInstance();
+        c.setTime(format.parse(date));
+        c.add(Calendar.MONTH, -1);
+        //   c.set(Calendar.DAY_OF_MONTH, 1);//设置为1号,当前日期既为本月第一天
+        return format.format(c.getTime());
+
+
+    }
+
     /**
      * 获取 两个日期之间的所有 日期
      *